From f02212b1fed716efb023a177d1d6170db7370784 Mon Sep 17 00:00:00 2001 From: HampusLundqvist <32696133+HampusLundqvist@users.noreply.github.com> Date: Mon, 23 May 2022 22:13:00 +0200 Subject: [PATCH 1/2] return event_status on all gitlab webhook types --- awx/api/views/webhooks.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/awx/api/views/webhooks.py b/awx/api/views/webhooks.py index 05e67d4fe2..d12eed9fb0 100644 --- a/awx/api/views/webhooks.py +++ b/awx/api/views/webhooks.py @@ -204,8 +204,6 @@ class GitlabWebhookReceiver(WebhookReceiverBase): return h.hexdigest() def get_event_status_api(self): - if self.get_event_type() != 'Merge Request Hook': - return project = self.request.data.get('project', {}) repo_url = project.get('web_url') if not repo_url: From 8d36712860fa73f7c2b83f5c42e09f7986fa0005 Mon Sep 17 00:00:00 2001 From: Hampus Lundqvist Date: Fri, 3 Jun 2022 16:10:44 +0200 Subject: [PATCH 2/2] return status on event types defined in ref_keys --- awx/api/views/webhooks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/api/views/webhooks.py b/awx/api/views/webhooks.py index d12eed9fb0..adb7aa199b 100644 --- a/awx/api/views/webhooks.py +++ b/awx/api/views/webhooks.py @@ -204,6 +204,8 @@ class GitlabWebhookReceiver(WebhookReceiverBase): return h.hexdigest() def get_event_status_api(self): + if self.get_event_type() not in self.ref_keys.keys(): + return project = self.request.data.get('project', {}) repo_url = project.get('web_url') if not repo_url: