paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

webhooks: Use Gitlab project web_url over repo homepage.

Browse Source 
This is preferred because the `repository` field isn't available for
project-level events.
This commit is contained in:
pemontto
2020-04-22 14:15:39 +01:00
committed by Tim Abbott
parent e41f4b01c0
commit 01a57ddd9d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/webhooks/gitlab/view.py
View File

@@ -33,7 +33,7 @@ def get_push_event_body(payload: Dict[str, Any]) -> str:
def get_normal_push_event_body(payload: Dict[str, Any]) -> str: def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
compare_url = '{}/compare/{}...{}'.format( compare_url = '{}/compare/{}...{}'.format(
get_repository_homepage(payload), get_project_homepage(payload),
payload['before'], payload['before'],
payload['after'] payload['after']
) )
@@ -267,8 +267,8 @@ def get_user_name(payload: Dict[str, Any]) -> str:
def get_issue_user_name(payload: Dict[str, Any]) -> str: def get_issue_user_name(payload: Dict[str, Any]) -> str:
return payload['user']['name'] return payload['user']['name']
def get_repository_homepage(payload: Dict[str, Any]) -> str: def get_project_homepage(payload: Dict[str, Any]) -> str:
return payload['repository']['homepage'] return payload['project']['web_url']
def get_branch_name(payload: Dict[str, Any]) -> str: def get_branch_name(payload: Dict[str, Any]) -> str:
return payload['ref'].replace('refs/heads/', '') return payload['ref'].replace('refs/heads/', '')