Merge pull request #1530 from rtfd/fix-github-connect

ericholscher · ericholscher · commit 56ef785bc354 · 2015-08-03T08:57:06.000-07:00
Set ACCOUNT_DEFAULT_HTTP_PROTOCOL to 'http' in production
diff --git a/readthedocs/settings/postgres.py b/readthedocs/settings/postgres.py
@@ -69,6 +69,9 @@
     'github': {'SCOPE': ['user:email', 'read:org', 'admin:repo_hook', 'repo:status']}
 }
 
+# allauth settings
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
+
 if not os.environ.get('DJANGO_SETTINGS_SKIP_LOCAL', False):
     try:
         from local_settings import *  # noqa

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@`
`69`	`69`	`'github': {'SCOPE': ['user:email', 'read:org', 'admin:repo_hook', 'repo:status']}`
`70`	`70`	`}`
`71`	`71`
	`72`	`+# allauth settings`
	`73`	`+ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'`
	`74`	`+`
`72`	`75`	`if not os.environ.get('DJANGO_SETTINGS_SKIP_LOCAL', False):`
`73`	`76`	`try:`
`74`	`77`	`from local_settings import * # noqa`