IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto join teams if coming from team sign-up page to login for GitLab (#3284)

Browse Source
This commit is contained in:
Joram Wilander
2016-06-07 17:43:06 -04:00
parent 52b5db3a0b
commit 68c2b070da
5 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/login/login_controller.jsx
View File

@@ -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>
);
}
}
}