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

Merge branch 'master' into 'master'
c465af09 · Stan Hu · 7aa8e12c · 8b94ca65 · c465af09 · c465af09
Commit c465af09 authored Jun 24, 2015 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

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

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 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)

--- 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