diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-15 10:01:37 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-15 10:01:37 -0800 |
commit | 61eac918b74494b085ff1863a027aa79437ed1ac (patch) | |
tree | edda731dd6d589abe98e025b437952d37d83eeaa /api/user.go | |
parent | c068d40c172af90fad36780b1186d72d593cbfa8 (diff) | |
parent | e774a67e33a8178c6c11e46f95da5cda28303c33 (diff) | |
download | chat-61eac918b74494b085ff1863a027aa79437ed1ac.tar.gz chat-61eac918b74494b085ff1863a027aa79437ed1ac.tar.bz2 chat-61eac918b74494b085ff1863a027aa79437ed1ac.zip |
Merge pull request #2 from mattermost/mm-1239
fixes mm-1239 adds config setting to turn off valet feature
Diffstat (limited to 'api/user.go')
-rw-r--r-- | api/user.go | 4 |
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 |