summaryrefslogtreecommitdiffstats
path: root/api/user.go
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-15 08:45:02 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-15 08:45:02 -0400
commit6982a61f69a0bf1e293a97cdd24ad7f1bc4e0058 (patch)
treedec06c9082b658e26aa2f49f40d3057a905c6b0d /api/user.go
parentc94883e0dfc0c7cbcf86a78f9134d1e3283a07cd (diff)
downloadchat-6982a61f69a0bf1e293a97cdd24ad7f1bc4e0058.tar.gz
chat-6982a61f69a0bf1e293a97cdd24ad7f1bc4e0058.tar.bz2
chat-6982a61f69a0bf1e293a97cdd24ad7f1bc4e0058.zip
fixes mm-1239 adds config setting to turn off valet feature
Diffstat (limited to 'api/user.go')
-rw-r--r--api/user.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go
index c0ebc05e0..83e29b28e 100644
--- a/api/user.go
+++ b/api/user.go
@@ -145,6 +145,10 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) {
}
func CreateValet(c *Context, team *model.Team) *model.User {
+ if !utils.Cfg.TeamSettings.AllowValet {
+ return &model.User{}
+ }
+
valet := &model.User{}
valet.TeamId = team.Id
valet.Email = utils.Cfg.EmailSettings.FeedbackEmail