Merge pull request #2107 from rgarmsen2295/plt-1715

PLT-1715 - Removed the ability to disable file storage from the admin console

3 files changed, 0 insertions, 7 deletions

diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx
index 12bf554ea..86f78e093 100644
--- a/web/react/components/admin_console/image_settings.jsx
+++ b/web/react/components/admin_console/image_settings.jsx
@@ -8,10 +8,6 @@ import crypto from 'crypto';
 import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl';
 
 const holders = defineMessages({
-    storeDisabled: {
-        id: 'admin.image.storeDisabled',
-        defaultMessage: 'Disable File Storage'
-    },
     storeLocal: {
         id: 'admin.image.storeLocal',
         defaultMessage: 'Local File System'
@@ -242,7 +238,6 @@ class FileSettings extends React.Component {
                                 defaultValue={this.props.config.FileSettings.DriverName}
                                 onChange={this.handleChange.bind(this, 'DriverName')}
                             >
-                                <option value=''>{formatMessage(holders.storeDisabled)}</option>
                                 <option value='local'>{formatMessage(holders.storeLocal)}</option>
                                 <option value='amazons3'>{formatMessage(holders.storeAmazonS3)}</option>
                             </select>
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 6f2ae8c3e..2ef130894 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -148,7 +148,6 @@
   "admin.gitlab.userTitle": "User API Endpoint:",
   "admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v3/user.   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
   "admin.gitlab.save": "Save",
-  "admin.image.storeDisabled": "Disable File Storage",
   "admin.image.storeLocal": "Local File System",
   "admin.image.storeAmazonS3": "Amazon S3",
   "admin.image.localExample": "Ex \"./data/\"",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 19582b836..09bdefcf5 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -157,7 +157,6 @@
   "admin.image.shareDescription": "Permitir a los usuarios compartir enlaces públicos para archivos e imágenes.",
   "admin.image.shareTitle": "Compartir publicamente enlaces de archivos: ",
   "admin.image.storeAmazonS3": "Amazon S3",
-  "admin.image.storeDisabled": "Deshabilitar almacenamiento de archivos",
   "admin.image.storeLocal": "Sistema local de archivos",
   "admin.image.storeTitle": "Almacenar archivos en:",
   "admin.image.thumbHeightDescription": "Alto de imágen miniatura subida. Actualizando este valor la imagen miniatura cambia en el futuro, pero no cambia para imagenes creadas en el pasado.",