summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-12 13:56:21 -0700
committerCorey Hulen <corey@hulen.com>2015-10-12 13:56:21 -0700
commita6a3c351a828441313e90c1ac8e6afbfadad1f7c (patch)
treee7d41a6789d421d8cbcbbb1417edf74810ac3672 /config/config.json
parent7a469c8fc19694a2d6afd2bd420ba6fd3a9a0d93 (diff)
parent9f83a72f7330857e06095403c1cf5402bef455d6 (diff)
downloadchat-a6a3c351a828441313e90c1ac8e6afbfadad1f7c.tar.gz
chat-a6a3c351a828441313e90c1ac8e6afbfadad1f7c.tar.bz2
chat-a6a3c351a828441313e90c1ac8e6afbfadad1f7c.zip
Merge pull request #997 from mattermost/PLT-586
PLT-586 fixing issues with security alert
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json
index 919737da7..8ef151350 100644
--- a/config/config.json
+++ b/config/config.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,