Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
af7ce322
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 搜索 >>
提交
af7ce322
编写于
7月 27, 2016
作者:
B
Ben Boeckel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
webhooks: include old revision in MR update events
上级
ab3dd9a1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
7 deletion
+11
-7
CHANGELOG
CHANGELOG
+1
-0
app/services/merge_requests/base_service.rb
app/services/merge_requests/base_service.rb
+6
-3
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+1
-1
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+3
-3
未找到文件。
CHANGELOG
浏览文件 @
af7ce322
...
...
@@ -20,6 +20,7 @@ v 8.11.0 (unreleased)
- Optimize checking if a user has read access to a list of issues !5370
- Nokogiri's various parsing methods are now instrumented
- Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363
- Include old revision in merge request update hooks (Ben Boeckel)
- Add build event color in HipChat messages (David Eisner)
- Make fork counter always clickable. !5463 (winniehell)
- All created issues, API or WebUI, can be submitted to Akismet for spam check !5333
...
...
app/services/merge_requests/base_service.rb
浏览文件 @
af7ce322
...
...
@@ -17,16 +17,19 @@ module MergeRequests
end
end
def
hook_data
(
merge_request
,
action
)
def
hook_data
(
merge_request
,
action
,
oldrev
=
nil
)
hook_data
=
merge_request
.
to_hook_data
(
current_user
)
hook_data
[
:object_attributes
][
:url
]
=
Gitlab
::
UrlBuilder
.
build
(
merge_request
)
hook_data
[
:object_attributes
][
:action
]
=
action
if
oldrev
&&
!
Gitlab
::
Git
.
blank_ref?
(
oldrev
)
hook_data
[
:object_attributes
][
:oldrev
]
=
oldrev
end
hook_data
end
def
execute_hooks
(
merge_request
,
action
=
'open'
)
def
execute_hooks
(
merge_request
,
action
=
'open'
,
oldrev
=
nil
)
if
merge_request
.
project
merge_data
=
hook_data
(
merge_request
,
action
)
merge_data
=
hook_data
(
merge_request
,
action
,
oldrev
)
merge_request
.
project
.
execute_hooks
(
merge_data
,
:merge_request_hooks
)
merge_request
.
project
.
execute_services
(
merge_data
,
:merge_request_hooks
)
end
...
...
app/services/merge_requests/refresh_service.rb
浏览文件 @
af7ce322
...
...
@@ -137,7 +137,7 @@ module MergeRequests
# Call merge request webhook with update branches
def
execute_mr_web_hooks
merge_requests_for_source_branch
.
each
do
|
merge_request
|
execute_hooks
(
merge_request
,
'update'
)
execute_hooks
(
merge_request
,
'update'
,
@oldrev
)
end
end
...
...
spec/services/merge_requests/refresh_service_spec.rb
浏览文件 @
af7ce322
...
...
@@ -57,7 +57,7 @@ describe MergeRequests::RefreshService, services: true do
it
'should execute hooks with update action'
do
expect
(
refresh_service
).
to
have_received
(
:execute_hooks
).
with
(
@merge_request
,
'update'
)
with
(
@merge_request
,
'update'
,
@oldrev
)
end
it
{
expect
(
@merge_request
.
notes
).
not_to
be_empty
}
...
...
@@ -113,7 +113,7 @@ describe MergeRequests::RefreshService, services: true do
it
'should execute hooks with update action'
do
expect
(
refresh_service
).
to
have_received
(
:execute_hooks
).
with
(
@fork_merge_request
,
'update'
)
with
(
@fork_merge_request
,
'update'
,
@oldrev
)
end
it
{
expect
(
@merge_request
.
notes
).
to
be_empty
}
...
...
@@ -158,7 +158,7 @@ describe MergeRequests::RefreshService, services: true do
it
'refreshes the merge request'
do
expect
(
refresh_service
).
to
receive
(
:execute_hooks
).
with
(
@fork_merge_request
,
'update'
)
with
(
@fork_merge_request
,
'update'
,
Gitlab
::
Git
::
BLANK_SHA
)
allow_any_instance_of
(
Repository
).
to
receive
(
:merge_base
).
and_return
(
@oldrev
)
refresh_service
.
execute
(
Gitlab
::
Git
::
BLANK_SHA
,
@newrev
,
'refs/heads/master'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录