Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d3c24373
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,发现更多精彩内容 >>
提交
d3c24373
编写于
12月 03, 2015
作者:
R
Rubén Dávila
提交者:
Robert Speicher
2月 19, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add new endpoint and button to revert merge. #3409
上级
96158aa6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
8 addition
and
1 deletion
+8
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+4
-0
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+3
-1
config/routes.rb
config/routes.rb
+1
-0
未找到文件。
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
d3c24373
...
@@ -191,6 +191,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -191,6 +191,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
end
end
def
revert
redirect_to
new_namespace_project_merge_request_url
(
@project
.
namespace
,
@project
)
end
def
branch_from
def
branch_from
#This is always source
#This is always source
@source_project
=
@merge_request
.
nil?
?
@project
:
@merge_request
.
source_project
@source_project
=
@merge_request
.
nil?
?
@project
:
@merge_request
.
source_project
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
浏览文件 @
d3c24373
...
@@ -17,4 +17,6 @@
...
@@ -17,4 +17,6 @@
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
Edit
Edit
-
if
@merge_request
.
closed?
-
if
@merge_request
.
closed?
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'btn btn-nr btn-grouped btn-reopen reopen-mr-link'
,
title:
'Reopen merge request'
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'btn btn-nr btn-grouped btn-reopen reopen-mr-link'
,
title:
"Reopen merge request"
-
if
@merge_request
.
merged?
=
link_to
'Revert'
,
revert_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
method: :post
,
class:
"btn btn-grouped btn-close"
,
title:
"Revert merge request"
config/routes.rb
浏览文件 @
d3c24373
...
@@ -590,6 +590,7 @@ Rails.application.routes.draw do
...
@@ -590,6 +590,7 @@ Rails.application.routes.draw do
post
:cancel_merge_when_build_succeeds
post
:cancel_merge_when_build_succeeds
get
:ci_status
get
:ci_status
post
:toggle_subscription
post
:toggle_subscription
post
:revert
end
end
collection
do
collection
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录