Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 9 insertions, 7 deletions

diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index c0194f5b847..fb7683f940d 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -5,31 +5,33 @@ module Issues
     include SpamCheckMethods
     include ResolveDiscussions
 
-    def execute
+    def execute(skip_system_notes: false)
       @issue = BuildService.new(project, current_user, params).execute
 
       filter_spam_check_params
       filter_resolve_discussion_params
 
-      create(@issue)
+      create(@issue, skip_system_notes: skip_system_notes)
     end
 
     def before_create(issue)
       spam_check(issue, current_user, action: :create)
-      issue.move_to_end
 
       # current_user (defined in BaseService) is not available within run_after_commit block
       user = current_user
       issue.run_after_commit do
         NewIssueWorker.perform_async(issue.id, user.id)
+        IssuePlacementWorker.perform_async(nil, issue.project_id)
       end
     end
 
-    def after_create(issuable)
-      todo_service.new_issue(issuable, current_user)
+    def after_create(issue)
+      add_incident_label(issue)
+      todo_service.new_issue(issue, current_user)
       user_agent_detail_service.create
-      resolve_discussions_with_issue(issuable)
-      delete_milestone_total_issue_counter_cache(issuable.milestone)
+      resolve_discussions_with_issue(issue)
+      delete_milestone_total_issue_counter_cache(issue.milestone)
+      track_incident_action(current_user, issue, :incident_created)
 
       super
     end