Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
68e3fa0e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
68e3fa0e
编写于
3月 17, 2017
作者:
A
Alex Sanford
提交者:
Sean McGivern
3月 17, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add ability to disable Merge Request URL on push
上级
d68c23a0
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
73 addition
and
1 deletion
+73
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-0
app/services/merge_requests/get_urls_service.rb
app/services/merge_requests/get_urls_service.rb
+2
-0
app/views/projects/_merge_request_merge_settings.html.haml
app/views/projects/_merge_request_merge_settings.html.haml
+4
-0
changelogs/unreleased/21451-allow-disable-mr-link.yml
changelogs/unreleased/21451-allow-disable-mr-link.yml
+4
-0
db/migrate/20170301125302_add_printing_merge_request_link_enabled_to_project.rb
...302_add_printing_merge_request_link_enabled_to_project.rb
+18
-0
db/schema.rb
db/schema.rb
+1
-0
spec/features/projects/settings/merge_requests_settings_spec.rb
...eatures/projects/settings/merge_requests_settings_spec.rb
+23
-0
spec/requests/api/internal_spec.rb
spec/requests/api/internal_spec.rb
+10
-1
spec/services/merge_requests/get_urls_service_spec.rb
spec/services/merge_requests/get_urls_service_spec.rb
+10
-0
未找到文件。
app/controllers/projects_controller.rb
浏览文件 @
68e3fa0e
...
...
@@ -316,6 +316,7 @@ class ProjectsController < Projects::ApplicationController
:namespace_id
,
:only_allow_merge_if_all_discussions_are_resolved
,
:only_allow_merge_if_pipeline_succeeds
,
:printing_merge_request_link_enabled
,
:path
,
:public_builds
,
:request_access_enabled
,
...
...
app/services/merge_requests/get_urls_service.rb
浏览文件 @
68e3fa0e
...
...
@@ -7,6 +7,8 @@ module MergeRequests
end
def
execute
(
changes
)
return
[]
unless
project
.
printing_merge_request_link_enabled
branches
=
get_branches
(
changes
)
merge_requests_map
=
opened_merge_requests_from_source_branches
(
branches
)
branches
.
map
do
|
branch
|
...
...
app/views/projects/_merge_request_merge_settings.html.haml
浏览文件 @
68e3fa0e
...
...
@@ -13,3 +13,7 @@
=
form
.
label
:only_allow_merge_if_all_discussions_are_resolved
do
=
form
.
check_box
:only_allow_merge_if_all_discussions_are_resolved
%strong
Only allow merge requests to be merged if all discussions are resolved
.checkbox
=
form
.
label
:printing_merge_request_link_enabled
do
=
form
.
check_box
:printing_merge_request_link_enabled
%strong
Show link to create/view merge request when pushing from the command line
changelogs/unreleased/21451-allow-disable-mr-link.yml
0 → 100644
浏览文件 @
68e3fa0e
---
title
:
Add ability to disable Merge Request URL on push
merge_request
:
9663
author
:
Alex Sanford
db/migrate/20170301125302_add_printing_merge_request_link_enabled_to_project.rb
0 → 100644
浏览文件 @
68e3fa0e
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
class
AddPrintingMergeRequestLinkEnabledToProject
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
disable_ddl_transaction!
# Set this constant to true if this migration requires downtime.
DOWNTIME
=
false
def
up
add_column_with_default
(
:projects
,
:printing_merge_request_link_enabled
,
:boolean
,
default:
true
)
end
def
down
remove_column
(
:projects
,
:printing_merge_request_link_enabled
)
end
end
db/schema.rb
浏览文件 @
68e3fa0e
...
...
@@ -1003,6 +1003,7 @@ ActiveRecord::Schema.define(version: 20170315174634) do
t
.
boolean
"lfs_enabled"
t
.
text
"description_html"
t
.
boolean
"only_allow_merge_if_all_discussions_are_resolved"
t
.
boolean
"printing_merge_request_link_enabled"
,
default:
true
,
null:
false
end
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
...
...
spec/features/projects/settings/merge_requests_settings_spec.rb
浏览文件 @
68e3fa0e
...
...
@@ -62,4 +62,27 @@ feature 'Project settings > Merge Requests', feature: true, js: true do
expect
(
page
).
to
have_content
(
'Only allow merge requests to be merged if all discussions are resolved'
)
end
end
describe
'Checkbox to enable merge request link'
do
before
do
visit
edit_project_path
(
project
)
end
scenario
'is initially checked'
do
checkbox
=
find_field
(
'project_printing_merge_request_link_enabled'
)
expect
(
checkbox
).
to
be_checked
end
scenario
'when unchecked sets :printing_merge_request_link_enabled to false'
do
uncheck
(
'project_printing_merge_request_link_enabled'
)
click_on
(
'Save'
)
# Wait for save to complete and page to reload
checkbox
=
find_field
(
'project_printing_merge_request_link_enabled'
)
expect
(
checkbox
).
not_to
be_checked
project
.
reload
expect
(
project
.
printing_merge_request_link_enabled
).
to
be
(
false
)
end
end
end
spec/requests/api/internal_spec.rb
浏览文件 @
68e3fa0e
...
...
@@ -397,16 +397,25 @@ describe API::Internal, api: true do
before
do
project
.
team
<<
[
user
,
:developer
]
get
api
(
"/internal/merge_request_urls?project=
#{
repo_name
}
&changes=
#{
changes
}
"
),
secret_token:
secret_token
end
it
'returns link to create new merge request'
do
get
api
(
"/internal/merge_request_urls?project=
#{
repo_name
}
&changes=
#{
changes
}
"
),
secret_token:
secret_token
expect
(
json_response
).
to
match
[{
"branch_name"
=>
"new_branch"
,
"url"
=>
"http://
#{
Gitlab
.
config
.
gitlab
.
host
}
/
#{
project
.
namespace
.
name
}
/
#{
project
.
path
}
/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
,
"new_merge_request"
=>
true
}]
end
it
'returns empty array if printing_merge_request_link_enabled is false'
do
project
.
update!
(
printing_merge_request_link_enabled:
false
)
get
api
(
"/internal/merge_request_urls?project=
#{
repo_name
}
&changes=
#{
changes
}
"
),
secret_token:
secret_token
expect
(
json_response
).
to
eq
([])
end
end
describe
'POST /notify_post_receive'
do
...
...
spec/services/merge_requests/get_urls_service_spec.rb
浏览文件 @
68e3fa0e
...
...
@@ -130,5 +130,15 @@ describe MergeRequests::GetUrlsService do
}])
end
end
context
'when printing_merge_request_link_enabled is false'
do
it
'returns empty array'
do
project
.
update!
(
printing_merge_request_link_enabled:
false
)
result
=
service
.
execute
(
existing_branch_changes
)
expect
(
result
).
to
eq
([])
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录