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

Add support for emphasize_branch_in_topic feature.

Browse Source 
(imported from commit 35a447ee7b94b83bd1c9425c678167003a398ae3)
This commit is contained in:
Tim Abbott
2015-09-20 13:34:13 -07:00
parent 4a858d7d1b
commit 38ca08b18f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/views/webhooks.py
View File

@@ -139,7 +139,8 @@ def api_github_landing(request, user_profile, event=REQ,
issue_stream=REQ(default=''), issue_stream=REQ(default=''),
exclude_pull_requests=REQ(converter=flexible_boolean, default=False), exclude_pull_requests=REQ(converter=flexible_boolean, default=False),
exclude_issues=REQ(converter=flexible_boolean, default=False), exclude_issues=REQ(converter=flexible_boolean, default=False),
exclude_commits=REQ(converter=flexible_boolean, default=False) exclude_commits=REQ(converter=flexible_boolean, default=False),
emphasize_branch_in_topic=REQ(converter=flexible_boolean, default=False),
): ):
repository = payload['repository'] repository = payload['repository']
@@ -157,7 +158,9 @@ def api_github_landing(request, user_profile, event=REQ,
'issue_stream': issue_stream, 'issue_stream': issue_stream,
'exclude_pull_requests': exclude_pull_requests, 'exclude_pull_requests': exclude_pull_requests,
'exclude_issues': exclude_issues, 'exclude_issues': exclude_issues,
'exclude_commits': exclude_commits})) 'exclude_commits': exclude_commits,
'emphasize_branch_in_topic': emphasize_branch_in_topic,
}))
f.write("\n") f.write("\n")
except Exception: except Exception:
logging.exception("Error while capturing Github event") logging.exception("Error while capturing Github event")
@@ -168,9 +171,7 @@ def api_github_landing(request, user_profile, event=REQ,
short_ref = re.sub(r'^refs/heads/', '', payload.get('ref', "")) short_ref = re.sub(r'^refs/heads/', '', payload.get('ref', ""))
kwargs = dict() kwargs = dict()
### realm-specific logic if (emphasize_branch_in_topic or user_profile.realm.domain == "customer26.invalid") and short_ref:
domain = user_profile.realm.domain
if domain == "customer26.invalid" and short_ref:
kwargs['topic_focus'] = short_ref kwargs['topic_focus'] = short_ref
allowed_events = set() allowed_events = set()