summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-14 16:19:44 -0600
committerCorey Hulen <corey@hulen.com>2016-01-14 16:19:44 -0600
commitf1feeb0d72646407c1ebd0e157f22b8151d4d917 (patch)
treeb6d2d87d44e9ac85955c41b0e883e7bfff2c6ef3 /web/react
parent1ef6fd1b2595eee03005fc21c5d147290d9610cd (diff)
parent8089487d5caccbc642e9fef8ee0e5930ff1e639d (diff)
downloadchat-f1feeb0d72646407c1ebd0e157f22b8151d4d917.tar.gz
chat-f1feeb0d72646407c1ebd0e157f22b8151d4d917.tar.bz2
chat-f1feeb0d72646407c1ebd0e157f22b8151d4d917.zip
Merge pull request #1894 from mattermost/release-1.4
Release 1.4
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/user_settings/user_settings_security.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx
index d9c5f58a9..d1266dd3f 100644
--- a/web/react/components/user_settings/user_settings_security.jsx
+++ b/web/react/components/user_settings/user_settings_security.jsx
@@ -206,7 +206,7 @@ export default class SecurityTab extends React.Component {
<div>
<a
className='btn btn-primary'
- href={'/' + teamName + '/claim?email=' + user.email}
+ href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email)}
>
{'Switch to using email and password'}
</a>
@@ -221,7 +221,7 @@ export default class SecurityTab extends React.Component {
<div>
<a
className='btn btn-primary'
- href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GITLAB_SERVICE}
+ href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GITLAB_SERVICE}
>
{'Switch to using GitLab SSO'}
</a>
@@ -236,7 +236,7 @@ export default class SecurityTab extends React.Component {
<div>
<a
className='btn btn-primary'
- href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GOOGLE_SERVICE}
+ href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GOOGLE_SERVICE}
>
{'Switch to using Google SSO'}
</a>