Updated merge request merged web hook to correctly fire action=merged.

Fixes #879 Fixes #498
2015-06-05 19:59:51 -04:00 · 2015-06-05 19:59:51 -04:00 · 0cf2e62fb2
parent 7aa8e12c54
commit 0cf2e62fb2
1 changed files with 1 additions and 1 deletions
--- 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