Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d7511a4b
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 搜索 >>
提交
d7511a4b
编写于
12月 03, 2015
作者:
R
Rubén Dávila
提交者:
Robert Speicher
2月 19, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Create reverse branch and generate MR with new branch. #3409
上级
d3c24373
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
2 deletion
+20
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+12
-2
app/models/merge_request.rb
app/models/merge_request.rb
+4
-0
app/models/repository.rb
app/models/repository.rb
+4
-0
未找到文件。
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
d7511a4b
...
...
@@ -2,7 +2,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action
:module_enabled
before_action
:merge_request
,
only:
[
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:builds
,
:merge
,
:merge_check
,
:ci_status
,
:toggle_subscription
,
:cancel_merge_when_build_succeeds
:ci_status
,
:toggle_subscription
,
:cancel_merge_when_build_succeeds
,
:revert
]
before_action
:closes_issues
,
only:
[
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:validates_merge_request
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
...
...
@@ -192,7 +193,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def
revert
redirect_to
new_namespace_project_merge_request_url
(
@project
.
namespace
,
@project
)
@repository
.
find_or_create_branch
(
@merge_request
.
reverse_branch_name
,
@merge_request
.
target_branch
)
url_params
=
{
merge_request:
{
source_branch:
@merge_request
.
reverse_branch_name
,
target_branch:
@merge_request
.
target_branch
,
source_project_id:
@merge_request
.
target_project_id
,
target_project_id:
@merge_request
.
target_project_id
}}
redirect_to
new_namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
url_params
)
end
def
branch_from
...
...
app/models/merge_request.rb
浏览文件 @
d7511a4b
...
...
@@ -532,4 +532,8 @@ class MergeRequest < ActiveRecord::Base
[
diff_base_commit
,
last_commit
]
end
def
reverse_branch_name
"revert-
#{
id
}
-
#{
target_branch
}
"
end
end
app/models/repository.rb
浏览文件 @
d7511a4b
...
...
@@ -137,6 +137,10 @@ class Repository
find_branch
(
branch_name
)
end
def
find_or_create_branch
(
name
,
ref
)
find_branch
(
name
)
or
add_branch
(
name
,
ref
)
end
def
add_tag
(
tag_name
,
ref
,
message
=
nil
)
expire_tags_cache
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录