Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5a444957
Commit
5a444957
authored
Mar 16, 2020
by
Gary Holtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes the notification service from the transaction block
parent
f3f9b99b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/services/merge_requests/post_merge_service.rb
app/services/merge_requests/post_merge_service.rb
+1
-1
No files found.
app/services/merge_requests/post_merge_service.rb
View file @
5a444957
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment