summaryrefslogtreecommitdiff
path: root/app/services/boards/issues
diff options
context:
space:
mode:
authorChantal Rollison <crollison@gitlab.com>2018-11-01 17:10:53 -0700
committerChantal Rollison <crollison@gitlab.com>2018-11-05 06:22:19 -0800
commitaf87e40a7814e97a5bb63fc354e1a7b6194a3052 (patch)
tree383ea0b820415ce747646d9ee6c059684c5f5afe /app/services/boards/issues
parent74b5dce44aa902364d7ff3a3d8f6a1fcd857993d (diff)
downloadgitlab-ce-af87e40a7814e97a5bb63fc354e1a7b6194a3052.tar.gz
Fixed label removal from issueccr/51052_keep_labels_on_issue
Diffstat (limited to 'app/services/boards/issues')
-rw-r--r--app/services/boards/issues/move_service.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 7dd87034410..43a26f4264e 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -70,10 +70,8 @@ module Boards
label_ids =
if moving_to_list.movable?
moving_from_list.label_id
- elsif board.group_board?
- ::Label.on_group_boards(parent.id).pluck(:label_id)
else
- ::Label.on_project_boards(parent.id).pluck(:label_id)
+ ::Label.on_board(board.id).pluck(:label_id)
end
Array(label_ids).compact