Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f14228f0
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,发现更多精彩内容 >>
提交
f14228f0
编写于
12月 13, 2016
作者:
T
twonegatives
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Notify the user who set auto-merge when a build fails
上级
b1120fc3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
7 deletion
+21
-7
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+1
-1
app/services/todo_service.rb
app/services/todo_service.rb
+9
-6
changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml
...nreleased/23524-notify-automerge-user-of-failed-build.yml
+4
-0
spec/services/todo_service_spec.rb
spec/services/todo_service_spec.rb
+7
-0
未找到文件。
app/helpers/todos_helper.rb
浏览文件 @
f14228f0
...
...
@@ -11,7 +11,7 @@ module TodosHelper
case
todo
.
action
when
Todo
::
ASSIGNED
then
'assigned you'
when
Todo
::
MENTIONED
then
'mentioned you on'
when
Todo
::
BUILD_FAILED
then
'The build failed for
your
'
when
Todo
::
BUILD_FAILED
then
'The build failed for'
when
Todo
::
MARKED
then
'added a todo for'
when
Todo
::
APPROVAL_REQUIRED
then
'set you as an approver for'
end
...
...
app/services/todo_service.rb
浏览文件 @
f14228f0
...
...
@@ -98,10 +98,12 @@ class TodoService
# When a build fails on the HEAD of a merge request we should:
#
# * create a todo for that user to fix it
# * create a todo for author of MR to fix it
# * create a todo for merge_user to keep an eye on it
#
def
merge_request_build_failed
(
merge_request
)
create_build_failed_todo
(
merge_request
)
create_build_failed_todo
(
merge_request
,
merge_request
.
author
)
create_build_failed_todo
(
merge_request
,
merge_request
.
merge_user
)
if
merge_request
.
merge_when_build_succeeds?
end
# When a new commit is pushed to a merge request we should:
...
...
@@ -115,9 +117,11 @@ class TodoService
# When a build is retried to a merge request we should:
#
# * mark all pending todos related to the merge request for the author as done
# * mark all pending todos related to the merge request for the merge_user as done
#
def
merge_request_build_retried
(
merge_request
)
mark_pending_todos_as_done
(
merge_request
,
merge_request
.
author
)
mark_pending_todos_as_done
(
merge_request
,
merge_request
.
merge_user
)
if
merge_request
.
merge_when_build_succeeds?
end
# When create a note we should:
...
...
@@ -236,10 +240,9 @@ class TodoService
create_todos
(
mentioned_users
,
attributes
)
end
def
create_build_failed_todo
(
merge_request
)
author
=
merge_request
.
author
attributes
=
attributes_for_todo
(
merge_request
.
project
,
merge_request
,
author
,
Todo
::
BUILD_FAILED
)
create_todos
(
author
,
attributes
)
def
create_build_failed_todo
(
merge_request
,
todo_author
)
attributes
=
attributes_for_todo
(
merge_request
.
project
,
merge_request
,
todo_author
,
Todo
::
BUILD_FAILED
)
create_todos
(
todo_author
,
attributes
)
end
def
attributes_for_target
(
target
)
...
...
changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml
0 → 100644
浏览文件 @
f14228f0
---
title
:
Create a TODO for user who set auto-merge when a build fails
merge_request
:
author
:
spec/services/todo_service_spec.rb
浏览文件 @
f14228f0
...
...
@@ -469,6 +469,13 @@ describe TodoService, services: true do
should_create_todo
(
user:
author
,
target:
mr_unassigned
,
action:
Todo
::
BUILD_FAILED
)
end
it
'creates a pending todo for merge_user'
do
mr_unassigned
.
update
(
merge_when_build_succeeds:
true
,
merge_user:
admin
)
service
.
merge_request_build_failed
(
mr_unassigned
)
should_create_todo
(
user:
admin
,
author:
admin
,
target:
mr_unassigned
,
action:
Todo
::
BUILD_FAILED
)
end
end
describe
'#merge_request_push'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录