diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0000 |
commit | 2e31c85a97183814ffa7ba5cc58f7bbad668fb2b (patch) | |
tree | 18be488a2381014d05dd0323228d00c153251a0f /app/services/labels | |
parent | 154b9bae142ba15fec753f44327654595094b879 (diff) | |
download | gitlab-ce-2e31c85a97183814ffa7ba5cc58f7bbad668fb2b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/labels')
-rw-r--r-- | app/services/labels/transfer_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/labels/transfer_service.rb b/app/services/labels/transfer_service.rb index 91984403db3..e6f9cf35fcb 100644 --- a/app/services/labels/transfer_service.rb +++ b/app/services/labels/transfer_service.rb @@ -49,7 +49,7 @@ module Labels Label.joins(:issues) .where( issues: { project_id: project.id }, - labels: { type: 'GroupLabel', group_id: old_group.id } + labels: { type: 'GroupLabel', group_id: old_group.self_and_ancestors } ) end # rubocop: enable CodeReuse/ActiveRecord @@ -59,14 +59,14 @@ module Labels Label.joins(:merge_requests) .where( merge_requests: { target_project_id: project.id }, - labels: { type: 'GroupLabel', group_id: old_group.id } + labels: { type: 'GroupLabel', group_id: old_group.self_and_ancestors } ) end # rubocop: enable CodeReuse/ActiveRecord def find_or_create_label!(label) params = label.attributes.slice('title', 'description', 'color') - new_label = FindOrCreateService.new(current_user, project, params).execute + new_label = FindOrCreateService.new(current_user, project, params.merge(include_ancestor_groups: true)).execute new_label.id end |