diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-25 22:49:05 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-25 22:49:05 -0800 |
| commit | 9d85ea3acff1c925118718996afc9daa39d679c7 (patch) | |
| tree | 9b5a9a9160d2a8fa3b6f7d5485c367706a4357c5 /app/services/merge_requests/merge_service.rb | |
| parent | 2b02852507466c8cd7dc9a7db7a7e0dd4c7b5183 (diff) | |
| download | gitlab-ce-9d85ea3acff1c925118718996afc9daa39d679c7.tar.gz | |
Organize event order execution when update issue or mr
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 1e1614028f7..327ead4ff3f 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -9,9 +9,9 @@ module MergeRequests def execute(merge_request, commit_message) merge_request.merge - notification_service.merge_mr(merge_request, current_user) create_merge_event(merge_request, current_user) create_note(merge_request) + notification_service.merge_mr(merge_request, current_user) execute_hooks(merge_request, 'merge') true |