Commit 5a444957 authored by Gary Holtz's avatar Gary Holtz

Removes the notification service from the transaction block

parent f3f9b99b
...@@ -16,10 +16,10 @@ module MergeRequests ...@@ -16,10 +16,10 @@ module MergeRequests
# relatively quick enough to put in a Transaction # relatively quick enough to put in a Transaction
create_event(merge_request) create_event(merge_request)
todo_service.merge_merge_request(merge_request, current_user) todo_service.merge_merge_request(merge_request, current_user)
notification_service.merge_mr(merge_request, current_user)
end end
# These operations are idempotent so can be safely run multiple times # These operations are idempotent so can be safely run multiple times
notification_service.merge_mr(merge_request, current_user)
create_note(merge_request) create_note(merge_request)
close_issues(merge_request) close_issues(merge_request)
invalidate_cache_counts(merge_request, users: merge_request.assignees) invalidate_cache_counts(merge_request, users: merge_request.assignees)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment