From fcd5ccbd74e50da07910ebea95b4ea0f9cc34abd Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 23 Mar 2015 08:31:48 +0100 Subject: [PATCH] Fixing empty body bug in gitlab webhooks --- taiga/hooks/gitlab/event_hooks.py | 3 +++ tests/integration/test_hooks_gitlab.py | 1 + 2 files changed, 4 insertions(+) diff --git a/taiga/hooks/gitlab/event_hooks.py b/taiga/hooks/gitlab/event_hooks.py index 426ab259..faa81df1 100644 --- a/taiga/hooks/gitlab/event_hooks.py +++ b/taiga/hooks/gitlab/event_hooks.py @@ -90,6 +90,9 @@ class PushEventHook(BaseEventHook): def replace_gitlab_references(project_url, wiki_text): + if wiki_text == None: + wiki_text = "" + template = "\g<1>[GitLab#\g<2>]({}/issues/\g<2>)\g<3>".format(project_url) return re.sub(r"(\s|^)#(\d+)(\s|$)", template, wiki_text, 0, re.M) diff --git a/tests/integration/test_hooks_gitlab.py b/tests/integration/test_hooks_gitlab.py index 54a44d6d..10935c46 100644 --- a/tests/integration/test_hooks_gitlab.py +++ b/tests/integration/test_hooks_gitlab.py @@ -383,3 +383,4 @@ def test_replace_gitlab_references(): assert event_hooks.replace_gitlab_references("project-url", " #2 ") == " [GitLab#2](project-url/issues/2) " assert event_hooks.replace_gitlab_references("project-url", " #2") == " [GitLab#2](project-url/issues/2)" assert event_hooks.replace_gitlab_references("project-url", "#test") == "#test" + assert event_hooks.replace_gitlab_references("project-url", None) == ""