summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-08 18:23:06 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-08 18:23:06 -0500
commit8e1c9c371b9fbfbc15d96d6f5c4092968dc41f43 (patch)
treebfd8f581b0a608ef8aa30e5bf0ec0e4f2cc4fda1 /web/react/components
parent1af689a5b65d98992a984cc5dfc43521c02941f4 (diff)
parente56454ca11c4b14ecc1cb097f2941e7d0980a7b8 (diff)
downloadchat-8e1c9c371b9fbfbc15d96d6f5c4092968dc41f43.tar.gz
chat-8e1c9c371b9fbfbc15d96d6f5c4092968dc41f43.tar.bz2
chat-8e1c9c371b9fbfbc15d96d6f5c4092968dc41f43.zip
Merge pull request #2107 from rgarmsen2295/plt-1715
PLT-1715 - Removed the ability to disable file storage from the admin console
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/admin_console/image_settings.jsx5
1 files changed, 0 insertions, 5 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>