diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
| commit | 0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7 (patch) | |
| tree | 3f86c6872aa94ee0530f8a6d2b7458fa655c11de /api/team.go | |
| parent | b7a821c3410ecd165241e2dbcf2c8376ae402124 (diff) | |
| parent | 6f10c401a422170d42d9cee8ec01b94808fa338f (diff) | |
| download | chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.tar.gz chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.tar.bz2 chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.zip | |
Merge pull request #1 from mattermost/master
to me
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) |