diff options
| author | Adam Meily <meily.adam@gmail.com> | 2015-06-05 19:59:51 -0400 |
|---|---|---|
| committer | Adam Meily <meily.adam@gmail.com> | 2015-06-24 10:15:18 -0400 |
| commit | 0cf2e62fb2a2d82cb43a32a3bd2ed429215d0b76 (patch) | |
| tree | 5bf604806adb065f12c91e0336e3909db43aba5a | |
| parent | 7aa8e12c549f1fc8bdc90d1ecfc8535a61f2aacb (diff) | |
| download | gitlab-ce-0cf2e62fb2a2d82cb43a32a3bd2ed429215d0b76.tar.gz | |
Updated merge request merged web hook to correctly fire action=merged.
Fixes #879
Fixes #498
| -rw-r--r-- | app/services/merge_requests/auto_merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/auto_merge_service.rb b/app/services/merge_requests/auto_merge_service.rb index 378b39bb9d6..cdedf48b0c0 100644 --- a/app/services/merge_requests/auto_merge_service.rb +++ b/app/services/merge_requests/auto_merge_service.rb @@ -14,7 +14,7 @@ module MergeRequests create_merge_event(merge_request, current_user) create_note(merge_request) notification_service.merge_mr(merge_request, current_user) - execute_hooks(merge_request) + execute_hooks(merge_request, 'merge') true else |