diff options
| author | Stas Vovk <stasvovk@gmail.com> | 2015-10-13 14:52:29 +0300 |
|---|---|---|
| committer | Stas Vovk <stasvovk@gmail.com> | 2015-10-13 14:52:29 +0300 |
| commit | a1328fc8b5d03ec73f1bad588d2f0bb688b1c206 (patch) | |
| tree | 4d47c0e181ebe961ab2a8a02f2698faeafba9434 /docker | |
| parent | 822881e51aa2edce1c4d7d2e11bc44c3886daf1e (diff) | |
| parent | 0144b6fd8a95c6b65695b07483a528707dce1cfe (diff) | |
| download | chat-a1328fc8b5d03ec73f1bad588d2f0bb688b1c206.tar.gz chat-a1328fc8b5d03ec73f1bad588d2f0bb688b1c206.tar.bz2 chat-a1328fc8b5d03ec73f1bad588d2f0bb688b1c206.zip | |
Merge branch 'master' into PLT-589
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/1.1/config_docker.json | 6 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 6 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docker/1.1/config_docker.json b/docker/1.1/config_docker.json index ab5b0a7be..653b6ffd7 100644 --- a/docker/1.1/config_docker.json +++ b/docker/1.1/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, 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, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index ab5b0a7be..653b6ffd7 100644 --- a/docker/local/config_docker.json +++ b/docker/local/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, |