From 68c2b070da59bd2cf9c5cd91901a4e3bf6084061 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 7 Jun 2016 17:43:06 -0400
Subject: Auto join teams if coming from team sign-up page to login for GitLab
 (#3284)

---
 webapp/components/login/login_controller.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webapp/components/login')

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
+}
-- 
cgit v1.2.3-1-g7c22