summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-28 10:35:27 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-28 10:35:27 -0400
commitc180cdbd1cba584c6e74cae7042de2290b51feb6 (patch)
tree19002d12a212d0bcc0e09d31410df548b93d77ef /utils/config.go
parent7225abddeefb569f1f2da739211d7797b63814a2 (diff)
parentc37d153ffb276e501660133de836a61eec25e544 (diff)
downloadchat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.gz
chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.bz2
chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/config.go b/utils/config.go
index 0da1d0abe..c85da7067 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -448,7 +448,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/")
props["SiteName"] = c.TeamSettings.SiteName
props["EnableTeamCreation"] = strconv.FormatBool(*c.TeamSettings.EnableTeamCreation)
- props["EnableUserCreation"] = strconv.FormatBool(*c.TeamSettings.EnableUserCreation)
+ props["EnableUserDeactivation"] = strconv.FormatBool(*c.TeamSettings.EnableUserDeactivation)
props["EnableOpenServer"] = strconv.FormatBool(*c.TeamSettings.EnableOpenServer)
props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage
props["RestrictTeamInvite"] = *c.TeamSettings.RestrictTeamInvite