taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing empty body bug in gitlab webhooks

remotes/origin/enhancement/email-actions
Alejandro Alonso 2015-03-23 08:31:48 +01:00
parent b15601be75
commit fcd5ccbd74
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taiga/hooks/gitlab/event_hooks.py
View File

@ -90,6 +90,9 @@ class PushEventHook(BaseEventHook):
def replace_gitlab_references(project_url, wiki_text): 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) 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) return re.sub(r"(\s|^)#(\d+)(\s|$)", template, wiki_text, 0, re.M)

1
tests/integration/test_hooks_gitlab.py
View File

@ -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", " #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", "#test") == "#test"
assert event_hooks.replace_gitlab_references("project-url", None) == ""