diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-06-27 12:04:54 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-06-27 12:05:37 -0300 |
| commit | dba2d6ee7f94c5657903fb20e9ef4fdac667df74 (patch) | |
| tree | fa61bf51baaaa49ac6684f6b01511e703ca2ccdc /app/services/merge_requests | |
| parent | c82b57789dea2d95f725e87e20e6b763493c7677 (diff) | |
| download | gitlab-ce-dba2d6ee7f94c5657903fb20e9ef4fdac667df74.tar.gz | |
Mark MR as merged regardless of errors when closing issues
We should mark the MR as merged as first thing on PostMergeService as in practice it is already merged on the repository. Happens that errors may happen when executing external services such as Issues::CloseService, and we do not want a MR hanging as opened because of that.
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb index 5b160ffba67..7606d68ff29 100644 --- a/app/services/merge_requests/post_merge_service.rb +++ b/app/services/merge_requests/post_merge_service.rb @@ -6,9 +6,9 @@ module MergeRequests # class PostMergeService < MergeRequests::BaseService def execute(merge_request) + merge_request.mark_as_merged close_issues(merge_request) todo_service.merge_merge_request(merge_request, current_user) - merge_request.mark_as_merged create_event(merge_request) create_note(merge_request) notification_service.merge_mr(merge_request, current_user) |