summaryrefslogtreecommitdiffstats
path: root/api/team.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-15 10:01:37 -0800
committerCorey Hulen <corey@hulen.com>2015-06-15 10:01:37 -0800
commit61eac918b74494b085ff1863a027aa79437ed1ac (patch)
treeedda731dd6d589abe98e025b437952d37d83eeaa /api/team.go
parentc068d40c172af90fad36780b1186d72d593cbfa8 (diff)
parente774a67e33a8178c6c11e46f95da5cda28303c33 (diff)
downloadchat-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/team.go')
-rw-r--r--api/team.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/api/team.go b/api/team.go
index b04d8c588..cb60602c6 100644
--- a/api/team.go
+++ b/api/team.go
@@ -157,9 +157,11 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- CreateValet(c, rteam)
- if c.Err != nil {
- return
+ if utils.Cfg.TeamSettings.AllowValet {
+ CreateValet(c, rteam)
+ if c.Err != nil {
+ return
+ }
}
InviteMembers(rteam, ruser, teamSignup.Invites)