diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
| commit | 2047991363844b4f17216f94778b432ed198a412 (patch) | |
| tree | 6b90710c44dae00178ad323d796beb59737f47f1 /app/services/boards/issues/move_service.rb | |
| parent | 7a1c5ba7471b233c994f5b5b313085d0d1292b5d (diff) | |
| parent | f3203cbbc25586df622552153cc460d2f79f414e (diff) | |
| download | gitlab-ce-2047991363844b4f17216f94778b432ed198a412.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/services/boards/issues/move_service.rb')
| -rw-r--r-- | app/services/boards/issues/move_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb index d5735f13c1e..ecabb2a48e4 100644 --- a/app/services/boards/issues/move_service.rb +++ b/app/services/boards/issues/move_service.rb @@ -38,7 +38,7 @@ module Boards attrs.merge!( add_label_ids: add_label_ids, remove_label_ids: remove_label_ids, - state_event: issue_state, + state_event: issue_state ) end @@ -61,7 +61,7 @@ module Boards if moving_to_list.movable? moving_from_list.label_id else - project.boards.joins(:lists).merge(List.movable).pluck(:label_id) + Label.on_project_boards(project.id).pluck(:label_id) end Array(label_ids).compact |