Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan@ryan-scott.me>2017-03-30 04:39:06 +0300
committerSean McGivern <sean@gitlab.com>2017-07-20 17:33:24 +0300
commit01c9488f4a559063eba77074ba2d369de87b8018 (patch)
treeffd18d3ebd174cf47ab9eb71cbacd940d4cf2831 /app/services/issuable_base_service.rb
parentb6555693a8e445405c5746b7c76c9f603395bba2 (diff)
Added slash command to close an issue as a duplicate. Closes #26372
Diffstat (limited to 'app/services/issuable_base_service.rb')
-rw-r--r--app/services/issuable_base_service.rb22
1 files changed, 22 insertions, 0 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 9078b1f0983..c7e646222bb 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -46,6 +46,14 @@ class IssuableBaseService < BaseService
SystemNoteService.change_time_spent(issuable, issuable.project, current_user)
end
+ def create_issue_duplicate_note(issuable, original_issue)
+ SystemNoteService.mark_duplicate_issue(issuable, issuable.project, current_user, original_issue)
+ end
+
+ def create_cross_reference_note(noteable, mentioner)
+ SystemNoteService.cross_reference(noteable, mentioner, current_user)
+ end
+
def filter_params(issuable)
ability_name = :"admin_#{issuable.to_ability_name}"
@@ -58,6 +66,7 @@ class IssuableBaseService < BaseService
params.delete(:assignee_ids)
params.delete(:assignee_id)
params.delete(:due_date)
+ params.delete(:original_issue_id)
end
filter_assignee(issuable)
@@ -209,6 +218,7 @@ class IssuableBaseService < BaseService
change_state(issuable)
change_subscription(issuable)
change_todo(issuable)
+ change_issue_duplicate(issuable)
toggle_award(issuable)
filter_params(issuable)
old_labels = issuable.labels.to_a
@@ -291,6 +301,18 @@ class IssuableBaseService < BaseService
end
end
+ def change_issue_duplicate(issuable)
+ original_issue_id = params.delete(:original_issue_id)
+ return if original_issue_id.nil?
+
+ original_issue = IssuesFinder.new(current_user).find(original_issue_id)
+ if original_issue.present?
+ create_issue_duplicate_note(issuable, original_issue)
+ close_service.new(project, current_user, {}).execute(issuable)
+ create_cross_reference_note(original_issue, issuable)
+ end
+ end
+
def toggle_award(issuable)
award = params.delete(:emoji_award)
if award