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

[manual] Rename humbug@humbughq.com to zulip@zulip.com.

Browse Source 
This requires renaming the account in Google Apps at the time we
deploy this; we'll probably want to do this during off hours to avoid
any user-visible downtime.

This also updates some related email addresses.

(imported from commit fce7629b359a4f278bbf7815c8d177a8fa0484fe)
This commit is contained in:
Tim Abbott
2013-10-04 13:59:25 -04:00
committed by Steve Howell
parent 6920ba0ac3
commit 70c666c3c6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/setup.py
View File

@@ -16,7 +16,7 @@ setup(name='zulip',
version=zulip.__version__, version=zulip.__version__,
description='Bindings for the Zulip message API', description='Bindings for the Zulip message API',
author='Zulip, Inc.', author='Zulip, Inc.',
author_email='humbug@humbughq.com', author_email='zulip@zulip.com',
classifiers=[ classifiers=[
'Development Status :: 3 - Alpha', 'Development Status :: 3 - Alpha',
'Environment :: Web Environment', 'Environment :: Web Environment',

6
zerver/views/__init__.py
View File

@@ -260,8 +260,8 @@ Company: %s
# users: %s # users: %s
Currently using: %s""" % (name, email, company, count, product,) Currently using: %s""" % (name, email, company, count, product,)
subject = "Interest in Zulip: %s" % (company,) subject = "Interest in Zulip: %s" % (company,)
from_email = '"%s" <humbug+signups@humbughq.com>' % (name,) from_email = '"%s" <zulip+signups@zulip.com>' % (name,)
to_email = '"Zulip Signups" <humbug+signups@humbughq.com>' to_email = '"Zulip Signups" <zulip+signups@zulip.com>'
headers = {'Reply-To' : '"%s" <%s>' % (name, email,)} headers = {'Reply-To' : '"%s" <%s>' % (name, email,)}
msg = EmailMessage(subject, content, from_email, [to_email], headers=headers) msg = EmailMessage(subject, content, from_email, [to_email], headers=headers)
msg.send() msg.send()
@@ -408,7 +408,7 @@ def accounts_accept_terms(request):
'email': email, 'email': email,
'ip': request.META['REMOTE_ADDR'], 'ip': request.META['REMOTE_ADDR'],
'browser': request.META['HTTP_USER_AGENT']}), 'browser': request.META['HTTP_USER_AGENT']}),
"humbug@humbughq.com", settings.EMAIL_HOST_USER,
["all@zulip.com"]) ["all@zulip.com"])
do_change_full_name(request.user, full_name) do_change_full_name(request.user, full_name)
return redirect(home) return redirect(home)

2
zproject/local_settings.py
View File

@@ -34,7 +34,7 @@ CAMO_KEY = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
EMAIL_USE_TLS = True EMAIL_USE_TLS = True
EMAIL_HOST = 'smtp.gmail.com' EMAIL_HOST = 'smtp.gmail.com'
EMAIL_HOST_USER = 'humbug@humbughq.com' EMAIL_HOST_USER = 'zulip@zulip.com'
EMAIL_HOST_PASSWORD = 'xxxxxxxxxxxxxxxx' EMAIL_HOST_PASSWORD = 'xxxxxxxxxxxxxxxx'
EMAIL_PORT = 587 EMAIL_PORT = 587