Commit 4d397f15 authored by Adam Meily's avatar Adam Meily

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

Fixes #879
Fixes #498
parent e73d7b67
...@@ -14,7 +14,7 @@ module MergeRequests ...@@ -14,7 +14,7 @@ module MergeRequests
create_merge_event(merge_request, current_user) create_merge_event(merge_request, current_user)
create_note(merge_request) create_note(merge_request)
notification_service.merge_mr(merge_request, current_user) notification_service.merge_mr(merge_request, current_user)
execute_hooks(merge_request) execute_hooks(merge_request, 'merge')
true true
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment