Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c3c97034
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,发现更多精彩内容 >>
提交
c3c97034
编写于
3月 23, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
27809a80
88a15b4e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
9 deletion
+13
-9
CHANGELOG
CHANGELOG
+1
-0
app/models/merge_request.rb
app/models/merge_request.rb
+9
-0
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+3
-9
未找到文件。
CHANGELOG
浏览文件 @
c3c97034
...
...
@@ -32,6 +32,7 @@ v 7.10.0 (unreleased)
- Add inifinite scroll to user page activity
- Don't show commit comment button when user is not signed in.
- Don't include system notes in issue/MR comment count.
- Don't mark merge request as updated when merge status relative to target branch changes.
v 7.9.0
- Send EmailsOnPush email when branch or tag is created or deleted.
...
...
app/models/merge_request.rb
浏览文件 @
c3c97034
...
...
@@ -105,6 +105,15 @@ class MergeRequest < ActiveRecord::Base
state
:unchecked
state
:can_be_merged
state
:cannot_be_merged
around_transition
do
|
merge_request
,
transition
,
block
|
merge_request
.
record_timestamps
=
false
begin
block
.
call
ensure
merge_request
.
record_timestamps
=
true
end
end
end
validates
:source_project
,
presence:
true
,
unless: :allow_broken
...
...
app/services/merge_requests/refresh_service.rb
浏览文件 @
c3c97034
...
...
@@ -53,7 +53,7 @@ module MergeRequests
if
merge_request
.
source_branch
==
@branch_name
||
force_push?
merge_request
.
reload_code
update_merge_request
(
merge_request
)
merge_request
.
mark_as_unchecked
else
mr_commit_ids
=
merge_request
.
commits
.
map
(
&
:id
)
push_commit_ids
=
@commits
.
map
(
&
:id
)
...
...
@@ -61,20 +61,14 @@ module MergeRequests
if
matches
.
any?
merge_request
.
reload_code
update_merge_request
(
merge_request
)
merge_request
.
mark_as_unchecked
else
update_merge_request
(
merge_request
)
merge_request
.
mark_as_unchecked
end
end
end
end
def
update_merge_request
(
merge_request
)
MergeRequests
::
UpdateService
.
new
(
merge_request
.
target_project
,
@current_user
,
merge_status:
'unchecked'
).
execute
(
merge_request
)
end
# Add comment about pushing new commits to merge requests
def
comment_mr_with_commits
merge_requests
=
@project
.
origin_merge_requests
.
opened
.
where
(
source_branch:
@branch_name
).
to_a
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录