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

Fixes #879 Fixes #498

Updated merge request merged web hook to correctly fire action=merged.
Fixes #879 Fixes #498
0cf2e62f · Adam Meily · 7aa8e12c · 0cf2e62f
Commit 0cf2e62f authored Jun 05, 2015 by Adam Meily
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/services/merge_requests/auto_merge_service.rb app/services/merge_requests/auto_merge_service.rb +1 -1

No files found.
--- 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