summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-06 09:15:40 +0000
committerDouwe Maan <douwe@gitlab.com>2016-05-06 09:15:40 +0000
commitaa18cc205c90ea027cd3f2788371f36fd0697fda (patch)
tree935b428132cbf73802250e22b6668f664e3533ed /app
parent622a33e98e68c1e08962486dd51dd912ad6c2eb7 (diff)
parente016cdb73ea8d57180594b4a8198a6272c338d73 (diff)
downloadgitlab-ce-aa18cc205c90ea027cd3f2788371f36fd0697fda.tar.gz
Merge branch 'issue_14532_assign_labels_milestone_when_moving_issue' into 'master'
Assign labels milestone when moving issue Closes #14532. See merge request !3934
Diffstat (limited to 'app')
-rw-r--r--app/services/issues/move_service.rb15
1 files changed, 13 insertions, 2 deletions
diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index 82e7090f1ea..e61628086f0 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -41,14 +41,25 @@ module Issues
private
def create_new_issue
- new_params = { id: nil, iid: nil, label_ids: [], milestone: nil,
+ new_params = { id: nil, iid: nil, label_ids: cloneable_label_ids,
+ milestone_id: cloneable_milestone_id,
project: @new_project, author: @old_issue.author,
description: rewrite_content(@old_issue.description) }
- new_params = @old_issue.serializable_hash.merge(new_params)
+ new_params = @old_issue.serializable_hash.symbolize_keys.merge(new_params)
CreateService.new(@new_project, @current_user, new_params).execute
end
+ def cloneable_label_ids
+ @new_project.labels
+ .where(title: @old_issue.labels.pluck(:title)).pluck(:id)
+ end
+
+ def cloneable_milestone_id
+ @new_project.milestones
+ .find_by(title: @old_issue.milestone.try(:title)).try(:id)
+ end
+
def rewrite_notes
@old_issue.notes.find_each do |note|
new_note = note.dup