From 543311848dc7b01036c08f416bd3a96e1b861315 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Mon, 18 Jul 2016 22:09:18 -0700
Subject: [PATCH] templates: Replace not_voyager check with dropboxAppKey
 check.

Also remove useless/confusing value of DROPBOX_APP_KEY in
DEFAULT_SETTINGS (it's overridden by the get_secret call anyway).
---
 templates/zerver/base.html | 2 +-
 zproject/settings.py       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/zerver/base.html b/templates/zerver/base.html
index 49e96d6178..e09edd684c 100644
--- a/templates/zerver/base.html
+++ b/templates/zerver/base.html
@@ -18,7 +18,7 @@
     <![endif]-->
     <link href="/static/favicon.ico?v=2" rel="shortcut icon">
 
-    {% if not_voyager %}
+    {% if dropboxAppKey %}
     <script type="text/javascript">var dropboxAppKey = "{{ dropboxAppKey }}";</script>
     {% endif %}
 
diff --git a/zproject/settings.py b/zproject/settings.py
index 074f1d7c6d..b6f880dc70 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -112,7 +112,6 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
                     'S3_AVATAR_BUCKET': '',
                     'LOCAL_UPLOADS_DIR': None,
                     'MAX_FILE_UPLOAD_SIZE': 25,
-                    'DROPBOX_APP_KEY': '',
                     'ERROR_REPORTING': True,
                     'STAGING_ERROR_NOTIFICATIONS': False,
                     'SAVE_FRONTEND_STACKTRACES': False,