1 files changed, 8 insertions, 4 deletions

diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 3cf4b82b9f2..234fcbede03 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -15,11 +15,15 @@ module Issues
     def before_create(issue)
       spam_check(issue, current_user)
       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)
+      end
     end
 
     def after_create(issuable)
-      event_service.open_issue(issuable, current_user)
-      notification_service.new_issue(issuable, current_user)
       todo_service.new_issue(issuable, current_user)
       user_agent_detail_service.create
       resolve_discussions_with_issue(issuable)
@@ -30,8 +34,8 @@ module Issues
 
       Discussions::ResolveService.new(project, current_user,
                                       merge_request: merge_request_to_resolve_discussions_of,
-                                      follow_up_issue: issue).
-        execute(discussions_to_resolve)
+                                      follow_up_issue: issue)
+        .execute(discussions_to_resolve)
     end
 
     private