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

derive DEFAULT_FROM_USER from EMAIL_HOST_USER

Browse Source 
(imported from commit 2358f00a8eddb744392cd8f8f02cbed406e25013)
This commit is contained in:
acrefoot
2013-11-14 12:51:15 -05:00
parent 8b64833b8a
commit 4a74425f37
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zproject/settings.py
View File

@@ -689,7 +689,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
ACCOUNT_ACTIVATION_DAYS=7 ACCOUNT_ACTIVATION_DAYS=7
DEFAULT_FROM_EMAIL = "Zulip <zulip@zulip.com>" DEFAULT_FROM_EMAIL = "Zulip <%s>" % (EMAIL_HOST_USER,)
# In some email setups, a single inbox may be setup to be a wildcard, so in that case allow # In some email setups, a single inbox may be setup to be a wildcard, so in that case allow
# differing senders. Otherwise, *always* use the DEFAULT_FROM_EMAIL when not sending via # differing senders. Otherwise, *always* use the DEFAULT_FROM_EMAIL when not sending via
# mandrill (i.e. in the localserver case) # mandrill (i.e. in the localserver case)