summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-08-19 11:07:04 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-08-19 11:07:04 -0400
commite664040f027496023119b492141b61cd99727183 (patch)
treee3feff9f1ced93c3622285623b89d036c034209f /web
parent0e994f4bd58e907620469d797ccd124eba96e248 (diff)
parent75288f21848088648bf0343d811c55adfd6d9ef1 (diff)
downloadchat-e664040f027496023119b492141b61cd99727183.tar.gz
chat-e664040f027496023119b492141b61cd99727183.tar.bz2
chat-e664040f027496023119b492141b61cd99727183.zip
Merge pull request #397 from mattermost/mm-1962
Fixes mm-1962 verify email redirect now works correctly
Diffstat (limited to 'web')
-rw-r--r--web/react/components/login.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index f9eacf094..b61ea931e 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -56,7 +56,7 @@ module.exports = React.createClass({
},
function loginFailed(err) {
if (err.message === 'Login failed because email address has not been verified') {
- window.location.href = '/verify_email?name=' + encodeURIComponent(name) + '&email=' + encodeURIComponent(email);
+ window.location.href = '/verify_email?teamname=' + encodeURIComponent(name) + '&email=' + encodeURIComponent(email);
return;
}
state.serverError = err.message;