diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-06-07 17:43:06 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-07 17:43:06 -0400 |
| commit | 68c2b070da59bd2cf9c5cd91901a4e3bf6084061 (patch) | |
| tree | 40b28fa96f65931a9c9e29724bf161c970e37362 /webapp/components/login | |
| parent | 52b5db3a0b5d2ed3b96a72d8e8865d61d865320e (diff) | |
| download | chat-68c2b070da59bd2cf9c5cd91901a4e3bf6084061.tar.gz chat-68c2b070da59bd2cf9c5cd91901a4e3bf6084061.tar.bz2 chat-68c2b070da59bd2cf9c5cd91901a4e3bf6084061.zip | |
Auto join teams if coming from team sign-up page to login for GitLab (#3284)
Diffstat (limited to 'webapp/components/login')
| -rw-r--r-- | webapp/components/login/login_controller.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index dd4a92f92..27b1cc39b 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -444,7 +444,7 @@ export default class LoginController extends React.Component { <a className='btn btn-custom-login gitlab' key='gitlab' - href={Client.getOAuthRoute() + '/gitlab/login'} + href={Client.getOAuthRoute() + '/gitlab/login' + this.props.location.search} > <span className='icon'/> <span> @@ -529,4 +529,4 @@ export default class LoginController extends React.Component { </div> ); } -}
\ No newline at end of file +} |