CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-06 21:18:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rebasing errors that rightfully made the linter sad

Browse Source 
(imported from commit fbed798c7d752ea2b058aeebb5ae31a620684a3a)
This commit is contained in:
Luke Faraone 2013-11-05 17:50:28 -05:00
parent 980dc8345a
commit 3daca0ca9c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/models.py
View File

@ -143,7 +143,7 @@ def email_to_domain(email):
def remote_user_to_email(remote_user):
if settings.SSO_APPEND_DOMAIN is not None:
remote_user += "@" + SSO_APPEND_DOMAIN
remote_user += "@" + settings.SSO_APPEND_DOMAIN
return remote_user
class RealmEmoji(models.Model):

4
zerver/views/__init__.py
View File

@ -23,7 +23,7 @@ from zerver.models import Message, UserProfile, Stream, Subscription, \
get_recipient, valid_stream_name, to_dict_cache_key_id, \
extract_message_dict, stringify_message_dict, parse_usermessage_flags, \
email_to_domain, email_to_username, get_realm, completely_open, \
is_super_user, AppleDeviceToken, get_active_user_dicts_in_realm
is_super_user, AppleDeviceToken, get_active_user_dicts_in_realm, remote_user_to_email
from zerver.lib.actions import bulk_remove_subscriptions, \
do_change_password, create_mirror_user_if_needed, compute_irc_user_fullname, \
compute_jabber_user_fullname, do_change_full_name, \
@ -475,7 +475,7 @@ def maybe_send_to_registration(request, email, full_name=''):
def remote_user_sso(request):
try:
remote_user = request.META["REMOTE_USER"]
except KeyError as e:
except KeyError:
raise JsonableError("No REMOTE_USER set.")
user = authenticate(remote_user=remote_user)