summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-10-05 11:48:10 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-10-05 11:48:10 -0400
commitb591c4b32ee7cb5ea54738f9cb2bcb95b9583496 (patch)
treed5494bbc684888994531fd433f6b78b62fb0080a /docker
parent5d3649b5a478766261832e83236d7cb80e490f8b (diff)
parentef55d7f244cb727402a7c0a570efd719e794cf66 (diff)
downloadchat-b591c4b32ee7cb5ea54738f9cb2bcb95b9583496.tar.gz
chat-b591c4b32ee7cb5ea54738f9cb2bcb95b9583496.tar.bz2
chat-b591c4b32ee7cb5ea54738f9cb2bcb95b9583496.zip
Merge pull request #914 from mattermost/plt-297
PLT-297 Add ability to override username and icon for posts from incoming webhooks.
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json2
-rw-r--r--docker/local/config_docker.json2
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index 2611a63ce..ef91a21ea 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -6,6 +6,8 @@
"GoogleDeveloperKey": "",
"EnableOAuthServiceProvider": false,
"EnableIncomingWebhooks": true,
+ "EnablePostUsernameOverride": false,
+ "EnablePostIconOverride": false,
"EnableTesting": false
},
"TeamSettings": {
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 2611a63ce..ef91a21ea 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -6,6 +6,8 @@
"GoogleDeveloperKey": "",
"EnableOAuthServiceProvider": false,
"EnableIncomingWebhooks": true,
+ "EnablePostUsernameOverride": false,
+ "EnablePostIconOverride": false,
"EnableTesting": false
},
"TeamSettings": {