From 123cdcf0da2c459b6bb39f984a87dd46b7ae33cb Mon Sep 17 00:00:00 2001
From: jesopo
Date: Fri, 18 Oct 2019 03:52:59 +0100
Subject: pull_request -> merge_request

---
 modules/git_webhooks/gitlab.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/git_webhooks/gitlab.py b/modules/git_webhooks/gitlab.py
index 2f2a34eb..1b4b3831 100644
--- a/modules/git_webhooks/gitlab.py
+++ b/modules/git_webhooks/gitlab.py
@@ -7,14 +7,14 @@ EVENT_CATEGORIES = {
     ],
     "code": ["push"],
     "pr-minimal": [
-        "pull_request/opened", "pull_request/closed", "pull_request/reopened"
+        "merge_request/opened", "merge_request/closed", "merge_request/reopened"
     ],
     "pr": [
-        "pull_request/opened", "pull_request/closed", "pull_request/reopened",
-        "pull_request/edited", "pull_request/assigned",
-        "pull_request/unassigned"
+        "merge_request/opened", "merge_request/closed", "merge_request/reopened",
+        "merge_request/edited", "merge_request/assigned",
+        "merge_request/unassigned"
     ],
-    "pr-all": ["pull_request"],
+    "pr-all": ["merge_request"],
     "issue-minimal": [
         "issue/opened", "issue/closed", "issue/reopened", "issue/deleted"
     ],
@@ -78,7 +78,7 @@ class GitLab(object):
         if event == "push":
             return self.push(full_name, data)
         elif event == "merge_request":
-            return self.pull_request(full_name, data)
+            return self.merge_request(full_name, data)
         elif event == "issue":
             return self.issues(full_name, data)
         elif event == "note":
-- 
cgit v1.3.1-10-gc9f91