diff options
| author | Adam Meily <meily.adam@gmail.com> | 2015-06-05 19:59:51 -0400 |
|---|---|---|
| committer | Adam Meily <meily.adam@gmail.com> | 2015-06-05 19:59:51 -0400 |
| commit | 4d397f15c92d01732c55c6195a38c904c667f366 (patch) | |
| tree | 1f93655ea94d4b25ae764edb8211a675ec4322e9 | |
| parent | e73d7b6766aa2e22fafe247a4061698a148e72aa (diff) | |
| download | gitlab-ce-4d397f15c92d01732c55c6195a38c904c667f366.tar.gz | |
Updated merge request merged web hook to correctly fire action=merged.
Fixes #879
Fixes #498
| -rw-r--r-- | app/services/merge_requests/auto_merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |