From 58e5c654fac36e34b65a0f0824866b0f406a4267 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 20 Aug 2015 19:42:04 -0700 Subject: [PATCH] Make feedback button option default-off. (imported from commit 23b89ab72bd04826016631e01da950af0a5df694) --- zproject/local_settings_template.py | 4 ++-- zproject/settings.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py index 58e6d5affe..e0290f4578 100644 --- a/zproject/local_settings_template.py +++ b/zproject/local_settings_template.py @@ -57,13 +57,13 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = False SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # 2 weeks # Controls whether or not there is a feedback button in the UI. -ENABLE_FEEDBACK = True +ENABLE_FEEDBACK = False # By default, the feedback button will submit feedback to the Zulip # developers. If you set FEEDBACK_EMAIL to be an email address # (e.g. ZULIP_ADMINISTRATOR), feedback sent by your users will instead # be sent to that email address. -# FEEDBACK_EMAIL = ZULIP_ADMINISTRATOR +FEEDBACK_EMAIL = ZULIP_ADMINISTRATOR # Controls whether or not error reports are sent to Zulip. Error # reports are used to improve the quality of the product and do not diff --git a/zproject/settings.py b/zproject/settings.py index a459b9e898..dadd5d2925 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -389,7 +389,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '', 'ADMINS': '', 'INLINE_IMAGE_PREVIEW': True, 'CAMO_URI': '', - 'ENABLE_FEEDBACK': True, + 'ENABLE_FEEDBACK': DEPLOYED, 'FEEDBACK_EMAIL': None, 'ENABLE_GRAVATAR': True, 'DEFAULT_AVATAR_URI': '/static/images/default-avatar.png',