Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4c31455a
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,发现更多精彩内容 >>
提交
4c31455a
编写于
11月 06, 2017
作者:
G
George Andrinopoulos
提交者:
Rémy Coutable
11月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove create MR button from issues when MRs are disabled
上级
1e94172e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
11 deletion
+34
-11
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+16
-11
changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml
.../unreleased/38247-hide-create-mr-button-in-issue-show.yml
+5
-0
spec/features/issues/create_branch_merge_request_spec.rb
spec/features/issues/create_branch_merge_request_spec.rb
+13
-0
未找到文件。
app/views/projects/issues/_new_branch.html.haml
浏览文件 @
4c31455a
-
can_create_merge_request
=
can?
(
current_user
,
:create_merge_request
,
@project
)
-
data_action
=
can_create_merge_request
?
'create-mr'
:
'create-branch'
-
value
=
can_create_merge_request
?
'Create a merge request'
:
'Create a branch'
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
.create-mr-dropdown-wrap
{
data:
{
can_create_path:
can_create_branch_project_issue_path
(
@project
,
@issue
),
create_mr_path:
create_merge_request_project_issue_path
(
@project
,
@issue
),
create_branch_path:
project_branches_path
(
@project
,
branch_name:
@issue
.
to_branch_name
,
issue_iid:
@issue
.
iid
)
}
}
.create-mr-dropdown-wrap
{
data:
{
can_create_path:
can_create_branch_project_issue_path
(
@project
,
@issue
),
create_mr_path:
create_merge_request_project_issue_path
(
@project
,
@issue
),
create_branch_path:
project_branches_path
(
@project
,
branch_name:
@issue
.
to_branch_name
,
issue_iid:
@issue
.
iid
)
}
}
.btn-group.unavailable
.btn-group.unavailable
...
@@ -6,20 +10,21 @@
...
@@ -6,20 +10,21 @@
%span
.text
%span
.text
Checking branch availability…
Checking branch availability…
.btn-group.available.hide
.btn-group.available.hide
%input
.btn.js-create-merge-request.btn-inverted.btn-success
{
type:
'button'
,
value:
'Create a merge request'
,
data:
{
action:
'create-mr'
}
}
%input
.btn.js-create-merge-request.btn-inverted.btn-success
{
type:
'button'
,
value:
value
,
data:
{
action:
data_action
}
}
%button
.btn.btn-inverted.dropdown-toggle.btn-inverted.btn-success.js-dropdown-toggle
{
type:
'button'
,
data:
{
'dropdown-trigger'
=>
'#create-merge-request-dropdown'
}
}
%button
.btn.btn-inverted.dropdown-toggle.btn-inverted.btn-success.js-dropdown-toggle
{
type:
'button'
,
data:
{
'dropdown-trigger'
=>
'#create-merge-request-dropdown'
}
}
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
%ul
#create-merge-request-dropdown
.dropdown-menu.dropdown-menu-align-right
{
data:
{
dropdown:
true
}
}
%ul
#create-merge-request-dropdown
.dropdown-menu.dropdown-menu-align-right
{
data:
{
dropdown:
true
}
}
%li
.droplab-item-selected
{
role:
'button'
,
data:
{
value:
'create-mr'
,
'text'
=>
'Create a merge request'
}
}
-
if
can_create_merge_request
.menu-item
%li
.droplab-item-selected
{
role:
'button'
,
data:
{
value:
'create-mr'
,
'text'
=>
'Create a merge request'
}
}
.icon-container
.menu-item
=
icon
(
'check'
)
.icon-container
.description
=
icon
(
'check'
)
%strong
Create a merge request
.description
%span
%strong
Create a merge request
Creates a merge request named after this issue, with source branch created from '
#{
@project
.
default_branch
}
'.
%span
%li
.divider.droplab-item-ignore
Creates a merge request named after this issue, with source branch created from '
#{
@project
.
default_branch
}
'.
%li
{
role:
'button'
,
data:
{
value:
'create-branch'
,
'text'
=>
'Create a branch'
}
}
%li
.divider.droplab-item-ignore
%li
{
class:
[
!
can_create_merge_request
&&
'droplab-item-selected'
],
role:
'button'
,
data:
{
value:
'create-branch'
,
'text'
=>
'Create a branch'
}
}
.menu-item
.menu-item
.icon-container
.icon-container
=
icon
(
'check'
)
=
icon
(
'check'
)
...
...
changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml
0 → 100644
浏览文件 @
4c31455a
---
title
:
Remove create MR button from issues when MRs are disabled
merge_request
:
15071
author
:
George Andrinopoulos
type
:
fixed
spec/features/issues/create_branch_merge_request_spec.rb
浏览文件 @
4c31455a
...
@@ -64,6 +64,19 @@ feature 'Create Branch/Merge Request Dropdown on issue page', :feature, :js do
...
@@ -64,6 +64,19 @@ feature 'Create Branch/Merge Request Dropdown on issue page', :feature, :js do
end
end
end
end
context
'when merge requests are disabled'
do
before
do
project
.
project_feature
.
update
(
merge_requests_access_level:
0
)
visit
project_issue_path
(
project
,
issue
)
end
it
'shows only create branch button'
do
expect
(
page
).
not_to
have_button
(
'Create a merge request'
)
expect
(
page
).
to
have_button
(
'Create a branch'
)
end
end
context
'when issue is confidential'
do
context
'when issue is confidential'
do
it
'disables the create branch button'
do
it
'disables the create branch button'
do
issue
=
create
(
:issue
,
:confidential
,
project:
project
)
issue
=
create
(
:issue
,
:confidential
,
project:
project
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录