summaryrefslogtreecommitdiffstats
path: root/utils
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 /utils
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 'utils')
-rw-r--r--utils/config.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 3218211e3..44c4c43af 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -184,6 +184,8 @@ func getClientProperties(c *model.Config) map[string]string {
props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey
props["GoogleDeveloperKey"] = c.ServiceSettings.GoogleDeveloperKey
props["EnableIncomingWebhooks"] = strconv.FormatBool(c.ServiceSettings.EnableIncomingWebhooks)
+ props["EnablePostUsernameOverride"] = strconv.FormatBool(c.ServiceSettings.EnablePostUsernameOverride)
+ props["EnablePostIconOverride"] = strconv.FormatBool(c.ServiceSettings.EnablePostIconOverride)
props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
props["EnableSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.EnableSignUpWithEmail)