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

Change semantics of ZULIP_COM to include ZULIP_COM_STAGING machines.

Browse Source 
(imported from commit 2e84c756b4ac41c13d619ab6ceb99e347d1f48cb)
This commit is contained in:
Tim Abbott
2015-08-21 09:49:56 -07:00
parent a8261dd6ac
commit 83a653efce
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@@ -2173,7 +2173,7 @@ def encode_email_address_helper(name, email_token):
def decode_email_address(email):
# Perform the reverse of encode_email_address. Returns a tuple of (streamname, email_token)
pattern_parts = [re.escape(part) for part in settings.EMAIL_GATEWAY_PATTERN.split('%s')]
if settings.ZULIP_COM or settings.ZULIP_COM_STAGING:
if settings.ZULIP_COM:
# Accept mails delivered to any Zulip server
pattern_parts[-1] = r'@[\w-]*\.zulip\.net'
match_email_re = re.compile("(.*?)".join(pattern_parts))