diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
| commit | 296b93076888c9b26329938bd1cf1587397c7f51 (patch) | |
| tree | a37a396752971c88e13fc97d88531357ca09542e /api/team.go | |
| parent | fb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff) | |
| parent | 13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff) | |
| download | chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2 chat-296b93076888c9b26329938bd1cf1587397c7f51.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/api/team.go b/api/team.go index 4794b66df..fba4b41c6 100644 --- a/api/team.go +++ b/api/team.go @@ -75,7 +75,10 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - m["follow_link"] = bodyPage.Props["Link"] + if !utils.Cfg.EmailSettings.RequireEmailVerification { + m["follow_link"] = bodyPage.Props["Link"] + } + w.Header().Set("Access-Control-Allow-Origin", " *") w.Write([]byte(model.MapToJson(m))) } |