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 | 85a26987ae6b951d9022b5d8d1c9e465b72b5b8f (patch) | |
| tree | 9c9f31b5b9cf9d937533d56e3a575786533faed5 /api/team.go | |
| parent | 06a10ab27911d58032c2cd023fb576d221c7fb68 (diff) | |
| parent | 40dcfd99d7674f3651c98a29530d425f5be30bed (diff) | |
| download | chat-85a26987ae6b951d9022b5d8d1c9e465b72b5b8f.tar.gz chat-85a26987ae6b951d9022b5d8d1c9e465b72b5b8f.tar.bz2 chat-85a26987ae6b951d9022b5d8d1c9e465b72b5b8f.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.go | 8 |
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) |