Merge pull request #2107 from rgarmsen2295/plt-1715

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

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>