Merge pull request #13925 from stvstnfrd/up/settings/zendesk

Fallback to default ZENDESK_URL when not in JSON
This commit is contained in:
Ned Batchelder
2016-11-10 11:12:49 -05:00
committed by GitHub

View File

@@ -326,7 +326,7 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')
COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '')
CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull')
ZENDESK_URL = ENV_TOKENS.get("ZENDESK_URL")
ZENDESK_URL = ENV_TOKENS.get('ZENDESK_URL', ZENDESK_URL)
FEEDBACK_SUBMISSION_EMAIL = ENV_TOKENS.get("FEEDBACK_SUBMISSION_EMAIL")
MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', MKTG_URLS)