Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4b3afe23
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 搜索 >>
未验证
提交
4b3afe23
编写于
1月 22, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Always create merge_request_diff if MR created
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
94865a60
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
2 addition
and
3 deletion
+2
-3
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
app/models/merge_request.rb
app/models/merge_request.rb
+2
-0
app/observers/merge_request_observer.rb
app/observers/merge_request_observer.rb
+0
-1
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+0
-1
未找到文件。
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
4b3afe23
...
...
@@ -76,7 +76,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request
.
author
=
current_user
@target_branches
||=
[]
if
@merge_request
.
save
@merge_request
.
reload_code
redirect_to
[
@merge_request
.
target_project
,
@merge_request
],
notice:
'Merge request was successfully created.'
else
@source_project
=
@merge_request
.
source_project
...
...
app/models/merge_request.rb
浏览文件 @
4b3afe23
...
...
@@ -30,7 +30,9 @@ class MergeRequest < ActiveRecord::Base
belongs_to
:target_project
,
foreign_key: :target_project_id
,
class_name:
"Project"
belongs_to
:source_project
,
foreign_key: :source_project_id
,
class_name:
"Project"
has_one
:merge_request_diff
,
dependent: :destroy
after_create
:create_merge_request_diff
delegate
:commits
,
:diffs
,
:last_commit
,
:last_commit_short_sha
,
to: :merge_request_diff
,
prefix:
nil
...
...
app/observers/merge_request_observer.rb
浏览文件 @
4b3afe23
...
...
@@ -6,7 +6,6 @@ class MergeRequestObserver < ActivityObserver
create_event
(
merge_request
,
Event
.
determine_action
(
merge_request
))
end
merge_request
.
create_merge_request_diff
notification
.
new_merge_request
(
merge_request
,
current_user
)
merge_request
.
create_cross_references!
(
merge_request
.
project
,
current_user
)
execute_hooks
(
merge_request
)
...
...
lib/api/merge_requests.rb
浏览文件 @
4b3afe23
...
...
@@ -88,7 +88,6 @@ module API
end
if
merge_request
.
save
merge_request
.
reload_code
present
merge_request
,
with:
Entities
::
MergeRequest
else
handle_merge_request_errors!
merge_request
.
errors
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录