Updated merge request merged web hook to correctly fire action=merged.
Fixes #879 Fixes #498
This commit is contained in:
parent
7aa8e12c54
commit
0cf2e62fb2
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue