Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename humbughq.com realm to zulip.com. 

(imported from commit 6039719271be1e80fa7f80b9be851c8db7159f5e)
This commit is contained in:
Tim Abbott 2013-07-24 14:56:42 -04:00
parent b1aef98ed0
commit 3a1abc3ab0
7 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/lib/bugdown/__init__.py
View File

@ -379,7 +379,7 @@ def sanitize_url(url):
scheme = 'mailto' scheme = 'mailto'
# Humbug modification: If scheme is not specified, assume http:// # Humbug modification: If scheme is not specified, assume http://
# It's unlikely that users want relative links within humbughq.com. # It's unlikely that users want relative links within zulip.com.
# We re-enter sanitize_url because netloc etc. need to be re-parsed. # We re-enter sanitize_url because netloc etc. need to be re-parsed.
if not scheme: if not scheme:
return sanitize_url('http://' + url) return sanitize_url('http://' + url)
@ -629,7 +629,7 @@ def make_md_engine(key, opts):
realm_filters = { realm_filters = {
"default": [], "default": [],
"humbughq.com": [ "zulip.com": [
("#(?P<id>[0-9]{1,8})", "https://trac.humbughq.com/ticket/%(id)s"), ("#(?P<id>[0-9]{1,8})", "https://trac.humbughq.com/ticket/%(id)s"),
], ],
} }

10
zephyr/management/commands/populate_db.py
View File

@ -113,7 +113,7 @@ class Command(BaseCommand):
clear_database() clear_database()
# Create our two default realms # Create our two default realms
humbug_realm = Realm.objects.create(domain="humbughq.com") humbug_realm = Realm.objects.create(domain="zulip.com")
Realm.objects.create(domain="mit.edu") Realm.objects.create(domain="mit.edu")
realms = {} realms = {}
for realm in Realm.objects.all(): for realm in Realm.objects.all():
@ -126,7 +126,7 @@ class Command(BaseCommand):
("Prospero from The Tempest", "prospero@zulip.com"), ("Prospero from The Tempest", "prospero@zulip.com"),
("Cordelia Lear", "cordelia@zulip.com"), ("King Hamlet", "hamlet@zulip.com")] ("Cordelia Lear", "cordelia@zulip.com"), ("King Hamlet", "hamlet@zulip.com")]
for i in xrange(options["extra_users"]): for i in xrange(options["extra_users"]):
names.append(('Extra User %d' % (i,), 'extrauser%d@humbughq.com' % (i,))) names.append(('Extra User %d' % (i,), 'extrauser%d@zulip.com' % (i,)))
create_users(realms, names) create_users(realms, names)
# Create public streams. # Create public streams.
stream_list = ["Verona", "Denmark", "Scotland", "Venice", "Rome"] stream_list = ["Verona", "Denmark", "Scotland", "Venice", "Rome"]
@ -145,7 +145,7 @@ class Command(BaseCommand):
subscriptions_to_add.append(s) subscriptions_to_add.append(s)
Subscription.objects.bulk_create(subscriptions_to_add) Subscription.objects.bulk_create(subscriptions_to_add)
else: else:
humbug_realm = Realm.objects.get(domain="humbughq.com") humbug_realm = Realm.objects.get(domain="zulip.com")
recipient_streams = [klass.type_id for klass in recipient_streams = [klass.type_id for klass in
Recipient.objects.filter(type=Recipient.STREAM)] Recipient.objects.filter(type=Recipient.STREAM)]
@ -462,7 +462,7 @@ def restore_saved_messages():
elif sender_email in ["othello@zulip.com", "iago@zulip.com", "prospero@zulip.com", elif sender_email in ["othello@zulip.com", "iago@zulip.com", "prospero@zulip.com",
"cordelia@zulip.com", "hamlet@zulip.com"]: "cordelia@zulip.com", "hamlet@zulip.com"]:
message.sending_client = clients['populate_db'] message.sending_client = clients['populate_db']
elif realm.domain == "humbughq.com": elif realm.domain == "zulip.com":
message.sending_client = clients["website"] message.sending_client = clients["website"]
elif realm.domain == "mit.edu": elif realm.domain == "mit.edu":
message.sending_client = clients['zephyr_mirror'] message.sending_client = clients['zephyr_mirror']
@ -671,7 +671,7 @@ def restore_saved_messages():
(len(all_messages), tot_user_messages) (len(all_messages), tot_user_messages)
site = Site.objects.get_current() site = Site.objects.get_current()
site.domain = 'humbughq.com' site.domain = 'zulip.com'
site.save() site.save()
print datetime.datetime.now(), "Filling in user pointers..." print datetime.datetime.now(), "Filling in user pointers..."

2
zephyr/models.py
View File

@ -181,7 +181,7 @@ class Stream(models.Model):
# older than realm id 68 with some exceptions), we enable # older than realm id 68 with some exceptions), we enable
# historical messages for all streams that are not invite-only. # historical messages for all streams that are not invite-only.
return ((not settings.DEPLOYED or self.realm.domain in return ((not settings.DEPLOYED or self.realm.domain in
["humbughq.com"] or self.realm.id > 68) ["zulip.com"] or self.realm.id > 68)
and not self.invite_only) and not self.invite_only)
class Meta: class Meta:

4
zephyr/static/js/composebox_typeahead.js
View File

@ -101,8 +101,8 @@ function handle_keydown(e) {
// want to change focus right away in the private_message_recipient box since it // want to change focus right away in the private_message_recipient box since it
// takes the typeaheads a little time to open after the user finishes typing, which // takes the typeaheads a little time to open after the user finishes typing, which
// can lead to the focus moving without the autocomplete having a chance to happen. // can lead to the focus moving without the autocomplete having a chance to happen.
if ((page_params.domain === "humbughq.com" && nextFocus === "compose-send-button") || if ((page_params.domain === "zulip.com" && nextFocus === "compose-send-button") ||
(page_params.domain !== "humbughq.com" && nextFocus)) { (page_params.domain !== "zulip.com" && nextFocus)) {
ui.focus_on(nextFocus); ui.focus_on(nextFocus);
nextFocus = false; nextFocus = false;
} }

4
zephyr/static/js/subs.js
View File

@ -778,8 +778,8 @@ function show_new_stream_modal() {
var people_minus_you_and_maybe_humbuggers = []; var people_minus_you_and_maybe_humbuggers = [];
$.each(page_params.people_list, function (idx, person) { $.each(page_params.people_list, function (idx, person) {
if (person.email !== page_params.email && if (person.email !== page_params.email &&
(page_params.domain === "humbughq.com" || (page_params.domain === "zulip.com" ||
person.email.split('@')[1] !== "humbughq.com" person.email.split('@')[1] !== "zulip.com"
) )
) { ) {
people_minus_you_and_maybe_humbuggers.push({"email": person.email, people_minus_you_and_maybe_humbuggers.push({"email": person.email,

74
zephyr/tests.py
View File

@ -114,7 +114,7 @@ class AuthedTestCase(TestCase):
def register(self, username, password): def register(self, username, password):
self.client.post('/accounts/home/', self.client.post('/accounts/home/',
{'email': username + '@humbughq.com'}) {'email': username + '@zulip.com'})
return self.submit_reg_form_for_user(username, password) return self.submit_reg_form_for_user(username, password)
def submit_reg_form_for_user(self, username, password): def submit_reg_form_for_user(self, username, password):
@ -126,7 +126,7 @@ class AuthedTestCase(TestCase):
""" """
return self.client.post('/accounts/register/', return self.client.post('/accounts/register/',
{'full_name': username, 'password': password, {'full_name': username, 'password': password,
'key': find_key_by_email(username + '@humbughq.com'), 'key': find_key_by_email(username + '@zulip.com'),
'terms': True}) 'terms': True})
def get_api_key(self, email): def get_api_key(self, email):
@ -211,7 +211,7 @@ class AuthedTestCase(TestCase):
# Subscribe to a stream directly # Subscribe to a stream directly
def subscribe_to_stream(self, email, stream_name): def subscribe_to_stream(self, email, stream_name):
stream, _ = create_stream_if_needed(Realm.objects.get(domain="humbughq.com"), stream_name) stream, _ = create_stream_if_needed(Realm.objects.get(domain="zulip.com"), stream_name)
user_profile = get_user_profile_by_email(email) user_profile = get_user_profile_by_email(email)
do_add_subscription(user_profile, stream, no_log=True) do_add_subscription(user_profile, stream, no_log=True)
@ -318,7 +318,7 @@ class LoginTest(AuthedTestCase):
def test_register(self): def test_register(self):
self.register("test", "test") self.register("test", "test")
user_profile = get_user_profile_by_email('test@humbughq.com') user_profile = get_user_profile_by_email('test@zulip.com')
self.assertEqual(self.client.session['_auth_user_id'], user_profile.id) self.assertEqual(self.client.session['_auth_user_id'], user_profile.id)
def test_logout(self): def test_logout(self):
@ -330,7 +330,7 @@ class LoginTest(AuthedTestCase):
""" """
You can log in even if your password contain non-ASCII characters. You can log in even if your password contain non-ASCII characters.
""" """
email = "test@humbughq.com" email = "test@zulip.com"
password = u"hümbüǵ" password = u"hümbüǵ"
# Registering succeeds. # Registering succeeds.
@ -353,9 +353,9 @@ class PersonalMessagesTest(AuthedTestCase):
personals. personals.
""" """
self.register("test", "test") self.register("test", "test")
user_profile = get_user_profile_by_email('test@humbughq.com') user_profile = get_user_profile_by_email('test@zulip.com')
old_messages_count = message_stream_count(user_profile) old_messages_count = message_stream_count(user_profile)
self.send_message("test@humbughq.com", "test@humbughq.com", Recipient.PERSONAL) self.send_message("test@zulip.com", "test@zulip.com", Recipient.PERSONAL)
new_messages_count = message_stream_count(user_profile) new_messages_count = message_stream_count(user_profile)
self.assertEqual(new_messages_count, old_messages_count + 1) self.assertEqual(new_messages_count, old_messages_count + 1)
@ -375,7 +375,7 @@ class PersonalMessagesTest(AuthedTestCase):
for user_profile in old_user_profiles: for user_profile in old_user_profiles:
old_messages.append(message_stream_count(user_profile)) old_messages.append(message_stream_count(user_profile))
self.send_message("test1@humbughq.com", "test1@humbughq.com", Recipient.PERSONAL) self.send_message("test1@zulip.com", "test1@zulip.com", Recipient.PERSONAL)
new_messages = [] new_messages = []
for user_profile in old_user_profiles: for user_profile in old_user_profiles:
@ -383,7 +383,7 @@ class PersonalMessagesTest(AuthedTestCase):
self.assertEqual(old_messages, new_messages) self.assertEqual(old_messages, new_messages)
user_profile = get_user_profile_by_email("test1@humbughq.com") user_profile = get_user_profile_by_email("test1@zulip.com")
recipient = Recipient.objects.get(type_id=user_profile.id, type=Recipient.PERSONAL) recipient = Recipient.objects.get(type_id=user_profile.id, type=Recipient.PERSONAL)
self.assertEqual(most_recent_message(user_profile).recipient, recipient) self.assertEqual(most_recent_message(user_profile).recipient, recipient)
@ -446,7 +446,7 @@ class StreamMessagesTest(AuthedTestCase):
""" """
Check that messages sent to a stream reach all subscribers to that stream. Check that messages sent to a stream reach all subscribers to that stream.
""" """
subscribers = self.users_subscribed_to_stream(stream_name, "humbughq.com") subscribers = self.users_subscribed_to_stream(stream_name, "zulip.com")
old_subscriber_messages = [] old_subscriber_messages = []
for subscriber in subscribers: for subscriber in subscribers:
old_subscriber_messages.append(message_stream_count(subscriber)) old_subscriber_messages.append(message_stream_count(subscriber))
@ -501,7 +501,7 @@ class StreamMessagesTest(AuthedTestCase):
# Subscribe everyone to a stream with non-ASCII characters. # Subscribe everyone to a stream with non-ASCII characters.
non_ascii_stream_name = u"hümbüǵ" non_ascii_stream_name = u"hümbüǵ"
realm = Realm.objects.get(domain="humbughq.com") realm = Realm.objects.get(domain="zulip.com")
stream, _ = create_stream_if_needed(realm, non_ascii_stream_name) stream, _ = create_stream_if_needed(realm, non_ascii_stream_name)
for user_profile in UserProfile.objects.filter(realm=realm): for user_profile in UserProfile.objects.filter(realm=realm):
do_add_subscription(user_profile, stream, no_log=True) do_add_subscription(user_profile, stream, no_log=True)
@ -525,7 +525,7 @@ class BotTest(AuthedTestCase):
self.assert_json_success(result) self.assert_json_success(result)
def deactivate_bot(self): def deactivate_bot(self):
result = self.client.delete("/json/users/hambot-bot@humbughq.com") result = self.client.delete("/json/users/hambot-bot@zulip.com")
self.assert_json_success(result) self.assert_json_success(result)
def test_add_bot(self): def test_add_bot(self):
@ -550,7 +550,7 @@ class BotTest(AuthedTestCase):
self.assert_num_bots_equal(0) self.assert_num_bots_equal(0)
self.create_bot() self.create_bot()
self.assert_num_bots_equal(1) self.assert_num_bots_equal(1)
result = self.client.delete("/json/users/bogus-bot@humbughq.com") result = self.client.delete("/json/users/bogus-bot@zulip.com")
self.assert_json_error(result, 'No such user') self.assert_json_error(result, 'No such user')
self.assert_num_bots_equal(1) self.assert_num_bots_equal(1)
@ -568,7 +568,7 @@ class BotTest(AuthedTestCase):
result = self.client.delete("/json/users/hamlet@zulip.com") result = self.client.delete("/json/users/hamlet@zulip.com")
self.assert_json_error(result, 'Insufficient permission') self.assert_json_error(result, 'Insufficient permission')
result = self.client.delete("/json/users/hambot-bot@humbughq.com") result = self.client.delete("/json/users/hambot-bot@zulip.com")
self.assert_json_error(result, 'Insufficient permission') self.assert_json_error(result, 'Insufficient permission')
# But we don't actually deactivate the other person's bot. # But we don't actually deactivate the other person's bot.
@ -1066,7 +1066,7 @@ class SubscriptionAPITest(AuthedTestCase):
Calling subscribe on behalf of a principal that does not exist Calling subscribe on behalf of a principal that does not exist
should return a JSON error. should return a JSON error.
""" """
invalid_principal = "rosencrantz-and-guildenstern@humbughq.com" invalid_principal = "rosencrantz-and-guildenstern@zulip.com"
# verify that invalid_principal actually doesn't exist # verify that invalid_principal actually doesn't exist
with self.assertRaises(UserProfile.DoesNotExist): with self.assertRaises(UserProfile.DoesNotExist):
get_user_profile_by_email(invalid_principal) get_user_profile_by_email(invalid_principal)
@ -1266,7 +1266,7 @@ class GetOldMessagesTest(AuthedTestCase):
# We need to susbcribe to a stream and then send a message to # We need to susbcribe to a stream and then send a message to
# it to ensure that we actually have a stream message in this # it to ensure that we actually have a stream message in this
# narrow view. # narrow view.
realm = Realm.objects.get(domain="humbughq.com") realm = Realm.objects.get(domain="zulip.com")
stream, _ = create_stream_if_needed(realm, "Scotland") stream, _ = create_stream_if_needed(realm, "Scotland")
do_add_subscription(get_user_profile_by_email("hamlet@zulip.com"), do_add_subscription(get_user_profile_by_email("hamlet@zulip.com"),
stream, no_log=True) stream, no_log=True)
@ -1419,7 +1419,7 @@ class GetOldMessagesTest(AuthedTestCase):
def test_bad_narrow_nonexistent_email(self): def test_bad_narrow_nonexistent_email(self):
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
self.exercise_bad_narrow_operand("pm-with", ['non-existent-user@humbughq.com'], self.exercise_bad_narrow_operand("pm-with", ['non-existent-user@zulip.com'],
"Invalid narrow operator: unknown user") "Invalid narrow operator: unknown user")
def test_message_without_rendered_content(self): def test_message_without_rendered_content(self):
@ -1459,7 +1459,7 @@ class InviteUserTest(AuthedTestCase):
email to be sent. email to be sent.
""" """
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
invitee = "alice-test@humbughq.com" invitee = "alice-test@zulip.com"
self.assert_json_success(self.invite(invitee, ["Denmark"])) self.assert_json_success(self.invite(invitee, ["Denmark"]))
self.assertTrue(find_key_by_email(invitee)) self.assertTrue(find_key_by_email(invitee))
self.check_sent_emails([invitee]) self.check_sent_emails([invitee])
@ -1471,15 +1471,15 @@ class InviteUserTest(AuthedTestCase):
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
# Intentionally use a weird string. # Intentionally use a weird string.
self.assert_json_success(self.invite( self.assert_json_success(self.invite(
"""bob-test@humbughq.com, carol-test@humbughq.com, """bob-test@zulip.com, carol-test@zulip.com,
dave-test@humbughq.com dave-test@zulip.com
earl-test@humbughq.com""", ["Denmark"])) earl-test@zulip.com""", ["Denmark"]))
for user in ("bob", "carol", "dave", "earl"): for user in ("bob", "carol", "dave", "earl"):
self.assertTrue(find_key_by_email("%s-test@humbughq.com" % user)) self.assertTrue(find_key_by_email("%s-test@zulip.com" % user))
self.check_sent_emails(["bob-test@humbughq.com", "carol-test@humbughq.com", self.check_sent_emails(["bob-test@zulip.com", "carol-test@zulip.com",
"dave-test@humbughq.com", "earl-test@humbughq.com"]) "dave-test@zulip.com", "earl-test@zulip.com"])
def test_missing_or_invalid_params(self): def test_missing_or_invalid_params(self):
""" """
@ -1487,7 +1487,7 @@ earl-test@humbughq.com""", ["Denmark"]))
""" """
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
self.assert_json_error( self.assert_json_error(
self.client.post("/json/invite_users", {"invitee_emails": "foo@humbughq.com"}), self.client.post("/json/invite_users", {"invitee_emails": "foo@zulip.com"}),
"You must specify at least one stream for invitees to join.") "You must specify at least one stream for invitees to join.")
for address in ("noatsign.com", "outsideyourdomain@example.net"): for address in ("noatsign.com", "outsideyourdomain@example.net"):
@ -1501,7 +1501,7 @@ earl-test@humbughq.com""", ["Denmark"]))
Tests inviting to a non-existent stream. Tests inviting to a non-existent stream.
""" """
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
self.assert_json_error(self.invite("iago-test@humbughq.com", ["NotARealStream"]), self.assert_json_error(self.invite("iago-test@zulip.com", ["NotARealStream"]),
"Stream does not exist: NotARealStream. No invites were sent.") "Stream does not exist: NotARealStream. No invites were sent.")
self.check_sent_emails([]) self.check_sent_emails([])
@ -1529,7 +1529,7 @@ earl-test@humbughq.com""", ["Denmark"]))
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
existing = ["hamlet@zulip.com", "othello@zulip.com"] existing = ["hamlet@zulip.com", "othello@zulip.com"]
return return
new = ["foo-test@humbughq.com", "bar-test@humbughq.com"] new = ["foo-test@zulip.com", "bar-test@zulip.com"]
result = self.client.post("/json/invite_users", result = self.client.post("/json/invite_users",
{"invitee_emails": "\n".join(existing + new), {"invitee_emails": "\n".join(existing + new),
@ -1555,7 +1555,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
In a realm with `restricted_to_domain = True`, you can't invite people In a realm with `restricted_to_domain = True`, you can't invite people
with a different domain from that of the realm or your e-mail address. with a different domain from that of the realm or your e-mail address.
""" """
humbug_realm = Realm.objects.get(domain="humbughq.com") humbug_realm = Realm.objects.get(domain="zulip.com")
humbug_realm.restricted_to_domain = True humbug_realm.restricted_to_domain = True
humbug_realm.save() humbug_realm.save()
@ -1572,7 +1572,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
In a realm with `restricted_to_domain = False`, you can invite people In a realm with `restricted_to_domain = False`, you can invite people
with a different domain from that of the realm or your e-mail address. with a different domain from that of the realm or your e-mail address.
""" """
humbug_realm = Realm.objects.get(domain="humbughq.com") humbug_realm = Realm.objects.get(domain="zulip.com")
humbug_realm.restricted_to_domain = False humbug_realm.restricted_to_domain = False
humbug_realm.save() humbug_realm.save()
@ -1587,10 +1587,10 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
Inviting someone to streams with non-ASCII characters succeeds. Inviting someone to streams with non-ASCII characters succeeds.
""" """
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
invitee = "alice-test@humbughq.com" invitee = "alice-test@zulip.com"
stream_name = u"hümbüǵ" stream_name = u"hümbüǵ"
realm = Realm.objects.get(domain="humbughq.com") realm = Realm.objects.get(domain="zulip.com")
stream, _ = create_stream_if_needed(realm, stream_name) stream, _ = create_stream_if_needed(realm, stream_name)
# Make sure we're subscribed before inviting someone. # Make sure we're subscribed before inviting someone.
@ -2034,7 +2034,7 @@ class GetSubscribersTest(AuthedTestCase):
"Unable to retrieve subscribers for invite-only stream") "Unable to retrieve subscribers for invite-only stream")
def bugdown_convert(text): def bugdown_convert(text):
return bugdown.convert(text, "humbughq.com") return bugdown.convert(text, "zulip.com")
class BugdownTest(TestCase): class BugdownTest(TestCase):
def common_bugdown_test(self, text, expected): def common_bugdown_test(self, text, expected):
@ -2260,7 +2260,7 @@ int x = 3
('go to views.org please', "<p>go to %s please</p>", 'views.org'), ('go to views.org please', "<p>go to %s please</p>", 'views.org'),
('http://foo.com/blah_blah/', "<p>%s</p>", 'http://foo.com/blah_blah/'), ('http://foo.com/blah_blah/', "<p>%s</p>", 'http://foo.com/blah_blah/'),
('python class views.py is', "<p>python class views.py is</p>", ''), ('python class views.py is', "<p>python class views.py is</p>", ''),
('with www www.humbughq.com/foo ok?', "<p>with www %s ok?</p>", 'www.humbughq.com/foo'), ('with www www.zulip.com/foo ok?', "<p>with www %s ok?</p>", 'www.zulip.com/foo'),
('allow questions like foo.com?', "<p>allow questions like %s?</p>", 'foo.com'), ('allow questions like foo.com?', "<p>allow questions like %s?</p>", 'foo.com'),
('"is.gd/foo/ "', "<p>\"%s \"</p>", 'is.gd/foo/'), ('"is.gd/foo/ "', "<p>\"%s \"</p>", 'is.gd/foo/'),
('end of sentence https://t.co.', "<p>end of sentence %s.</p>", 'https://t.co'), ('end of sentence https://t.co.', "<p>end of sentence %s.</p>", 'https://t.co'),
@ -2270,7 +2270,7 @@ int x = 3
('http://www.guardian.co.uk/foo/bar', "<p>%s</p>", 'http://www.guardian.co.uk/foo/bar'), ('http://www.guardian.co.uk/foo/bar', "<p>%s</p>", 'http://www.guardian.co.uk/foo/bar'),
('from http://supervisord.org/running.html:', "<p>from %s:</p>", 'http://supervisord.org/running.html'), ('from http://supervisord.org/running.html:', "<p>from %s:</p>", 'http://supervisord.org/running.html'),
('http://raven.io', "<p>%s</p>", 'http://raven.io'), ('http://raven.io', "<p>%s</p>", 'http://raven.io'),
('at https://humbughq.com/api. Check it!', "<p>at %s. Check it!</p>", 'https://humbughq.com/api'), ('at https://zulip.com/api. Check it!', "<p>at %s. Check it!</p>", 'https://zulip.com/api'),
('goo.gl/abc', "<p>%s</p>", 'goo.gl/abc'), ('goo.gl/abc', "<p>%s</p>", 'goo.gl/abc'),
('I spent a year at ucl.ac.uk', "<p>I spent a year at %s</p>", 'ucl.ac.uk'), ('I spent a year at ucl.ac.uk', "<p>I spent a year at %s</p>", 'ucl.ac.uk'),
('http://a.cc/i/FMXO', "<p>%s</p>", 'http://a.cc/i/FMXO'), ('http://a.cc/i/FMXO', "<p>%s</p>", 'http://a.cc/i/FMXO'),
@ -2367,8 +2367,8 @@ NY-Haskell/events/108707682/?a=co1.1_grp&amp;rv=co1.1\">Haskell NYC Meetup</a></
('[YOLO](http://en.wikipedia.org/wiki/YOLO_(motto))', ('[YOLO](http://en.wikipedia.org/wiki/YOLO_(motto))',
'<p><a href="http://en.wikipedia.org/wiki/YOLO_(motto)" target="_blank" title="http://en.wikipedia.org/wiki/YOLO_(motto)"\ '<p><a href="http://en.wikipedia.org/wiki/YOLO_(motto)" target="_blank" title="http://en.wikipedia.org/wiki/YOLO_(motto)"\
>YOLO</a></p>'), >YOLO</a></p>'),
('Sent to http_something_real@humbughq.com', '<p>Sent to <a href="mailto:http_something_real@humbughq.com" \ ('Sent to http_something_real@zulip.com', '<p>Sent to <a href="mailto:http_something_real@zulip.com" \
title="mailto:http_something_real@humbughq.com">http_something_real@humbughq.com</a></p>'), title="mailto:http_something_real@zulip.com">http_something_real@zulip.com</a></p>'),
('Sent to othello@zulip.com', '<p>Sent to <a href="mailto:othello@zulip.com" title="mailto:othello@zulip.com">\ ('Sent to othello@zulip.com', '<p>Sent to <a href="mailto:othello@zulip.com" title="mailto:othello@zulip.com">\
othello@zulip.com</a></p>') othello@zulip.com</a></p>')
) )
@ -2633,7 +2633,7 @@ class UserPresenceTests(AuthedTestCase):
self.assert_json_success(result) self.assert_json_success(result)
json = ujson.loads(result.content) json = ujson.loads(result.content)
self.assertEqual(json['presences'][email][client]['status'], 'idle') self.assertEqual(json['presences'][email][client]['status'], 'idle')
# We only want @humbughq.com emails # We only want @zulip.com emails
for email in json['presences'].keys(): for email in json['presences'].keys():
self.assertEqual(email_to_domain(email), 'zulip.com') self.assertEqual(email_to_domain(email), 'zulip.com')

6
zephyr/views.py
View File

@ -1490,7 +1490,7 @@ class ActivityTable(object):
return sorted(self.rows.iteritems(), key=lambda (k,r): r['age']) return sorted(self.rows.iteritems(), key=lambda (k,r): r['age'])
def can_view_activity(request): def can_view_activity(request):
return request.user.realm.domain == 'humbughq.com' return request.user.realm.domain == 'zulip.com'
@login_required(login_url = settings.HOME_NOT_LOGGED_IN) @login_required(login_url = settings.HOME_NOT_LOGGED_IN)
def get_activity(request): def get_activity(request):
@ -1562,7 +1562,7 @@ def api_github_landing(request, user_profile, event=REQ,
stream = 'commits' stream = 'commits'
# CUSTOMER18 has requested not to get pull request notifications # CUSTOMER18 has requested not to get pull request notifications
if event == 'pull_request' and user_profile.realm.domain not in ['customer18.invalid', 'humbughq.com']: if event == 'pull_request' and user_profile.realm.domain not in ['customer18.invalid', 'zulip.com']:
pull_req = payload['pull_request'] pull_req = payload['pull_request']
subject = "%s: pull request %d" % (repository['name'], subject = "%s: pull request %d" % (repository['name'],
@ -1579,7 +1579,7 @@ def api_github_landing(request, user_profile, event=REQ,
# get spammed when people commit to non-master all over the place. # get spammed when people commit to non-master all over the place.
# Long-term, this will be replaced by some GitHub configuration # Long-term, this will be replaced by some GitHub configuration
# option of which branches to notify on. # option of which branches to notify on.
if short_ref != 'master' and user_profile.realm.domain in ['customer18.invalid', 'humbughq.com']: if short_ref != 'master' and user_profile.realm.domain in ['customer18.invalid', 'zulip.com']:
return json_success() return json_success()
if branches: if branches: