From 4d397f15c92d01732c55c6195a38c904c667f366 Mon Sep 17 00:00:00 2001
From: Adam Meily <meily.adam@gmail.com>
Date: Fri, 5 Jun 2015 19:59:51 -0400
Subject: Updated merge request merged web hook to correctly fire
 action=merged.

Fixes #879
Fixes #498
---
 app/services/merge_requests/auto_merge_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.1