Merge branch 'master' into 'master'
Updated merge request merged web hook to correctly fire action=merged. I believe this merge request will fix both issues #879 and #498. If a merge request was merged via the command line, the correct web hook was fired with the field `object_attributes.action = "merge"`. However, if the merge request was merged via the web UI, the webhook would be fired with `object_attributes.action = "open"`. See merge request !780
This commit is contained in:
commit
c465af0930
2 changed files with 2 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 7.13.0 (unreleased)
|
v 7.13.0 (unreleased)
|
||||||
|
- Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI
|
||||||
- Fix invalid timestamps in RSS feeds (Rowan Wookey)
|
- Fix invalid timestamps in RSS feeds (Rowan Wookey)
|
||||||
- Fix error when deleting a user who has projects (Stan Hu)
|
- Fix error when deleting a user who has projects (Stan Hu)
|
||||||
- Fix downloading of patches on public merge requests when user logged out (Stan Hu)
|
- Fix downloading of patches on public merge requests when user logged out (Stan Hu)
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue