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

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)

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