diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-29 17:25:29 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-29 17:25:29 -0400 |
| commit | 9aef3836b316bfc3701aab3e5dec072a070ef2df (patch) | |
| tree | af79532ab34af4fff24b4f407e5909b064596ab8 /api | |
| parent | 942702ff1a6cc3763742ea9fec6ecc587d998411 (diff) | |
| parent | 19a71ce00d3d45c9e1712352544ed3edced1b255 (diff) | |
| download | chat-9aef3836b316bfc3701aab3e5dec072a070ef2df.tar.gz chat-9aef3836b316bfc3701aab3e5dec072a070ef2df.tar.bz2 chat-9aef3836b316bfc3701aab3e5dec072a070ef2df.zip | |
Merge pull request #861 from mattermost/PLT-469
PLT-469 skip redirect if verified email required.
Diffstat (limited to 'api')
| -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))) } |