Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d00e5455
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,发现更多精彩内容 >>
提交
d00e5455
编写于
4月 20, 2016
作者:
D
Douwe Maan
提交者:
Douwe Maan
4月 20, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Verify the MR being displayed question has a merge commit set and can be cherry-picked
上级
34eacc53
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
13 addition
and
7 deletion
+13
-7
app/models/merge_request.rb
app/models/merge_request.rb
+4
-0
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-2
app/views/projects/merge_requests/widget/_merged_buttons.haml
...views/projects/merge_requests/widget/_merged_buttons.haml
+7
-5
未找到文件。
app/models/merge_request.rb
浏览文件 @
d00e5455
...
...
@@ -602,4 +602,8 @@ class MergeRequest < ActiveRecord::Base
def
can_be_reverted?
(
current_user
=
nil
)
merge_commit
&&
!
merge_commit
.
has_been_reverted?
(
current_user
,
self
)
end
def
can_be_cherry_picked?
merge_commit
end
end
app/views/projects/merge_requests/_show.html.haml
浏览文件 @
d00e5455
...
...
@@ -86,9 +86,9 @@
=
spinner
=
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
-
if
@merge_request
.
can_be_reverted?
-
if
@merge_request
.
can_be_reverted?
(
current_user
)
=
render
"projects/commit/change"
,
type:
'revert'
,
commit:
@merge_request
.
merge_commit
,
title:
@merge_request
.
title
-
if
@merge_request
.
merge_commit
-
if
@merge_request
.
can_be_cherry_picked?
=
render
"projects/commit/change"
,
type:
'cherry-pick'
,
commit:
@merge_request
.
merge_commit
,
title:
@merge_request
.
title
:javascript
...
...
app/views/projects/merge_requests/widget/_merged_buttons.haml
浏览文件 @
d00e5455
-
source_branch_exists
=
local_assigns
.
fetch
(
:source_branch_exists
,
false
)
-
mr_can_be_reverted
=
@merge_request
.
can_be_reverted?
-
can_remove_source_branch
=
local_assigns
.
fetch
(
:source_branch_exists
,
false
)
&&
@merge_request
.
can_remove_source_branch?
(
current_user
)
-
mr_can_be_reverted
=
@merge_request
.
can_be_reverted?
(
current_user
)
-
mr_can_be_cherry_picked
=
@merge_request
.
can_be_cherry_picked?
-
if
source_branch_exists
||
mr_can_be_revert
ed
-
if
can_remove_source_branch
||
mr_can_be_reverted
||
mr_can_be_cherry_pick
ed
.btn-group
-
if
source_branch_exists
-
if
can_remove_source_branch
=
link_to
namespace_project_branch_path
(
@merge_request
.
source_project
.
namespace
,
@merge_request
.
source_project
,
@merge_request
.
source_branch
),
remote:
true
,
method: :delete
,
class:
"btn btn-default btn-grouped btn-sm remove_source_branch"
do
=
icon
(
'trash-o'
)
Remove Source Branch
-
if
mr_can_be_reverted
=
revert_commit_link
(
@merge_request
.
merge_commit
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
btn_class:
'sm'
)
-
if
mr_can_be_cherry_picked
=
cherry_pick_commit_link
(
@merge_request
.
merge_commit
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
btn_class:
'sm'
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录