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

Merge pull request #949 from taigaio/issue/4995-multiline-commits-in-webhooks 

Issue#4995 Fix problems with multiline commits in the webhooks
remotes/origin/issue/4217/improving-mail-design
David Barragán Merino 2017-03-09 13:42:15 +01:00 committed by GitHub
parent ad60ac2235 f390404b98
commit a97892d06f
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
taiga/hooks/bitbucket/event_hooks.py
View File

@ -80,5 +80,6 @@ class PushEventHook(BaseBitBucketEventHook, BasePushEventHook):
"commit_id": commit.get("hash", None), "commit_id": commit.get("hash", None),
"commit_url": commit.get("links", {}).get('html', {}).get('href'), "commit_url": commit.get("links", {}).get('html', {}).get('href'),
"commit_message": message.strip(), "commit_message": message.strip(),
"commit_short_message": message.split("\n")[0].strip(),
}) })
return result return result

4
taiga/hooks/event_hooks.py
View File

@ -154,7 +154,7 @@ class BasePushEventHook(BaseEventHook):
) )
_status_change_message = _( _status_change_message = _(
"{user_text} changed the status from " "{user_text} changed the status from "
"[{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_message}'\")\n\n" "[{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_short_message}'\")\n\n"
" - Status: **{src_status}** → **{dst_status}**" " - Status: **{src_status}** → **{dst_status}**"
) )
_simple_status_change_message = _( _simple_status_change_message = _(
@ -177,7 +177,7 @@ class BasePushEventHook(BaseEventHook):
_status_change_message = _( _status_change_message = _(
"This {type_name} has been mentioned by {user_text} " "This {type_name} has been mentioned by {user_text} "
"in the [{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_message}'\") " "in the [{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_short_message}'\") "
"\"{commit_message}\"" "\"{commit_message}\""
) )
_simple_status_change_message = _( _simple_status_change_message = _(

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

@ -81,7 +81,8 @@ class PushEventHook(BaseGitHubEventHook, BasePushEventHook):
"user_url": github_user.get('html_url', None), "user_url": github_user.get('html_url', None),
"commit_id": commit.get("id", None), "commit_id": commit.get("id", None),
"commit_url": commit.get("url", None), "commit_url": commit.get("url", None),
"commit_message": commit.get("message", None), "commit_message": commit.get("message").strip(),
"commit_short_message": commit.get("message").split("\n")[0].strip(),
}) })
return result return result

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

@ -85,5 +85,6 @@ class PushEventHook(BaseGitLabEventHook, BasePushEventHook):
"commit_id": commit.get("id", None), "commit_id": commit.get("id", None),
"commit_url": commit.get("url", None), "commit_url": commit.get("url", None),
"commit_message": commit.get("message").strip(), "commit_message": commit.get("message").strip(),
"commit_short_message": commit.get("message").split("\n")[0].strip(),
}) })
return result return result

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

@ -47,6 +47,7 @@ class PushEventHook(BaseGogsEventHook, BasePushEventHook):
"user_url": os.path.join(os.path.dirname(os.path.dirname(project_url)), user_name), "user_url": os.path.join(os.path.dirname(os.path.dirname(project_url)), user_name),
"commit_id": commit.get("id", None), "commit_id": commit.get("id", None),
"commit_url": commit.get("url", None), "commit_url": commit.get("url", None),
"commit_message": commit.get("message", None), "commit_message": commit.get("message").strip(),
"commit_short_message": commit.get("message").split("\n")[0].strip(),
}) })
return result return result