From afd6800c9838ae64aeb9a892938741685acc7c14 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Fri, 18 Oct 2019 13:28:24 +0100
Subject: show merge_request/merge events

---
 modules/git_webhooks/gitlab.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/git_webhooks/gitlab.py')

diff --git a/modules/git_webhooks/gitlab.py b/modules/git_webhooks/gitlab.py
index 4b8420a7..cf0923c7 100644
--- a/modules/git_webhooks/gitlab.py
+++ b/modules/git_webhooks/gitlab.py
@@ -7,11 +7,12 @@ EVENT_CATEGORIES = {
     ],
     "code": ["push"],
     "pr-minimal": [
-        "merge_request/open", "merge_request/close", "merge_request/reopen"
+        "merge_request/open", "merge_request/close", "merge_request/reopen",
+        "merge_request/merge"
     ],
     "pr": [
         "merge_request/open", "merge_request/close", "merge_request/reopen",
-        "merge_request/update",
+        "merge_request/update", "merge_request/merge"
     ],
     "pr-all": ["merge_request"],
     "issue-minimal": [
@@ -45,7 +46,8 @@ ISSUE_ACTIONS = {
     "open": "opened",
     "close": "closed",
     "reopen": "reopened",
-    "update": "updated"
+    "update": "updated",
+    "merge": "merged"
 }
 
 class GitLab(object):
-- 
cgit v1.3.1-10-gc9f91