Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dcc1ab97
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,发现更多精彩内容 >>
提交
dcc1ab97
编写于
1月 10, 2018
作者:
J
Jarka Kadlecová
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Keep subscribers when promoting labels to group labels
上级
3576d59a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
1 deletion
+29
-1
app/services/labels/promote_service.rb
app/services/labels/promote_service.rb
+11
-1
changelogs/unreleased/37199-labels-fix.yml
changelogs/unreleased/37199-labels-fix.yml
+5
-0
spec/services/labels/promote_service_spec.rb
spec/services/labels/promote_service_spec.rb
+13
-0
未找到文件。
app/services/labels/promote_service.rb
浏览文件 @
dcc1ab97
...
...
@@ -13,6 +13,7 @@ module Labels
update_issuables
(
new_label
,
batched_ids
)
update_issue_board_lists
(
new_label
,
batched_ids
)
update_priorities
(
new_label
,
batched_ids
)
subscribe_users
(
new_label
,
batched_ids
)
# Order is important, project labels need to be last
update_project_labels
(
batched_ids
)
end
...
...
@@ -26,6 +27,15 @@ module Labels
private
def
subscribe_users
(
new_label
,
label_ids
)
# users can be subscribed to multiple labels that will be merged into the group one
# we want to keep only one subscription / user
ids_to_update
=
Subscription
.
where
(
subscribable_id:
label_ids
,
subscribable_type:
'Label'
)
.
group
(
:user_id
)
.
pluck
(
'MAX(id)'
)
Subscription
.
where
(
id:
ids_to_update
).
update_all
(
subscribable_id:
new_label
.
id
)
end
def
label_ids_for_merge
(
new_label
)
LabelsFinder
.
new
(
current_user
,
title:
new_label
.
title
,
group_id:
project
.
group
.
id
)
...
...
@@ -53,7 +63,7 @@ module Labels
end
def
update_project_labels
(
label_ids
)
Label
.
where
(
id:
label_ids
).
de
lete
_all
Label
.
where
(
id:
label_ids
).
de
stroy
_all
end
def
clone_label_to_group_label
(
label
)
...
...
changelogs/unreleased/37199-labels-fix.yml
0 → 100644
浏览文件 @
dcc1ab97
---
title
:
Keep subscribers when promoting labels to group labels
merge_request
:
author
:
type
:
fixed
spec/services/labels/promote_service_spec.rb
浏览文件 @
dcc1ab97
...
...
@@ -85,6 +85,19 @@ describe Labels::PromoteService do
change
(
project_3
.
labels
,
:count
).
by
(
-
1
)
end
it
'keeps users\' subscriptions'
do
user2
=
create
(
:user
)
project_label_1_1
.
subscriptions
.
create
(
user:
user
,
subscribed:
true
)
project_label_2_1
.
subscriptions
.
create
(
user:
user
,
subscribed:
true
)
project_label_3_2
.
subscriptions
.
create
(
user:
user
,
subscribed:
true
)
project_label_2_1
.
subscriptions
.
create
(
user:
user2
,
subscribed:
true
)
expect
{
service
.
execute
(
project_label_1_1
)
}.
to
change
{
Subscription
.
count
}.
from
(
4
).
to
(
3
)
expect
(
new_label
.
subscribed?
(
user
)).
to
be_truthy
expect
(
new_label
.
subscribed?
(
user2
)).
to
be_truthy
end
it
'recreates priorities'
do
service
.
execute
(
project_label_1_1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录