summaryrefslogtreecommitdiffstats
path: root/docker/dev
diff options
context:
space:
mode:
authorMaxim <mail@potapovmax.com>2015-10-13 10:15:44 +0300
committerMaxim <mail@potapovmax.com>2015-10-13 10:15:44 +0300
commit9d3248ccec89e533527bb86e082ef445c3cdfe7d (patch)
treefea41f942c66a2ae397ed12f1013585bcbf7775c /docker/dev
parent53d58fc3374268484a6eb5d8aae2c82719ec782d (diff)
parent0144b6fd8a95c6b65695b07483a528707dce1cfe (diff)
downloadchat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.tar.gz
chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.tar.bz2
chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.zip
Merge branch 'master' into PLT-590
Diffstat (limited to 'docker/dev')
-rw-r--r--docker/dev/config_docker.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index ab5b0a7be..653b6ffd7 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -8,7 +8,8 @@
"EnableIncomingWebhooks": true,
"EnablePostUsernameOverride": false,
"EnablePostIconOverride": false,
- "EnableTesting": false
+ "EnableTesting": false,
+ "EnableSecurityFixAlert": true
},
"TeamSettings": {
"SiteName": "Mattermost",
@@ -77,8 +78,7 @@
},
"PrivacySettings": {
"ShowEmailAddress": true,
- "ShowFullName": true,
- "EnableSecurityFixAlert": true
+ "ShowFullName": true
},
"GitLabSettings": {
"Enable": false,