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

android: Default to the GOOGLE_CLIENT_ID needed by the Android app.

This commit is contained in:
Tim Abbott 2016-08-22 21:06:40 -07:00
parent edb7d72dc2
commit 7d19d1809d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zproject/local_settings.py
View File

@ -86,8 +86,6 @@ APNS_FEEDBACK = "feedback_production"
APNS_CERT_FILE = "/etc/ssl/django-private/apns-dist.pem" APNS_CERT_FILE = "/etc/ssl/django-private/apns-dist.pem"
DBX_APNS_CERT_FILE = "/etc/ssl/django-private/dbx-apns-dist.pem" DBX_APNS_CERT_FILE = "/etc/ssl/django-private/dbx-apns-dist.pem"
GOOGLE_CLIENT_ID = "835904834568-77mtr5mtmpgspj9b051del9i9r5t4g4n.apps.googleusercontent.com"
GOOGLE_OAUTH2_CLIENT_ID = '835904834568-ag4p18v0sd9a0tero14r3gekn6shoen3.apps.googleusercontent.com' GOOGLE_OAUTH2_CLIENT_ID = '835904834568-ag4p18v0sd9a0tero14r3gekn6shoen3.apps.googleusercontent.com'
# Administrator domain for this install # Administrator domain for this install

3
zproject/settings.py
View File

@ -159,7 +159,8 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'OPEN_REALM_CREATION': False, 'OPEN_REALM_CREATION': False,
'REMOTE_POSTGRES_HOST': '', 'REMOTE_POSTGRES_HOST': '',
'REMOTE_POSTGRES_SSLMODE': '', 'REMOTE_POSTGRES_SSLMODE': '',
'GOOGLE_CLIENT_ID': '', # Default GOOGLE_CLIENT_ID to the value needed for Android auth to work
'GOOGLE_CLIENT_ID': '835904834568-77mtr5mtmpgspj9b051del9i9r5t4g4n.apps.googleusercontent.com',
'SOCIAL_AUTH_GITHUB_KEY': None, 'SOCIAL_AUTH_GITHUB_KEY': None,
'SOCIAL_AUTH_GITHUB_ORG_NAME': None, 'SOCIAL_AUTH_GITHUB_ORG_NAME': None,
'SOCIAL_AUTH_GITHUB_TEAM_ID': None, 'SOCIAL_AUTH_GITHUB_TEAM_ID': None,