diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-06-24 14:19:49 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-06-24 14:19:49 +0000 |
| commit | c465af093096990ee42b3021fce157d02b8864cb (patch) | |
| tree | c7f27ba986702fa47e5c8031a0d8076bf9eb7348 | |
| parent | 7aa8e12c549f1fc8bdc90d1ecfc8535a61f2aacb (diff) | |
| parent | 8b94ca655d2508a6b1885d170d4ad823787b2790 (diff) | |
| download | gitlab-ce-c465af093096990ee42b3021fce157d02b8864cb.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/services/merge_requests/auto_merge_service.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 498ec05fca9..60ee11b5f6e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. 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 error when deleting a user who has projects (Stan Hu) - Fix downloading of patches on public merge requests when user logged out (Stan Hu) diff --git a/app/services/merge_requests/auto_merge_service.rb b/app/services/merge_requests/auto_merge_service.rb index 378b39bb9d6..cdedf48b0c0 100644 --- 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 |