From 4d397f15c92d01732c55c6195a38c904c667f366 Mon Sep 17 00:00:00 2001 From: Adam Meily Date: Fri, 5 Jun 2015 19:59:51 -0400 Subject: [PATCH 1/3] 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 From 0cf2e62fb2a2d82cb43a32a3bd2ed429215d0b76 Mon Sep 17 00:00:00 2001 From: Adam Meily Date: Fri, 5 Jun 2015 19:59:51 -0400 Subject: [PATCH 2/3] 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 From aaa42e936e3ec491e8dc1159c741a90d87565f4f Mon Sep 17 00:00:00 2001 From: Adam Meily Date: Wed, 24 Jun 2015 10:17:03 -0400 Subject: [PATCH 3/3] Added CHANGELOG message for fixing MR webhook --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) 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)