Merge branch 'branch-6.5'

diff --cc server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js
Simple merge

diff --cc server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js
index dbfca919bae3cf6fd82b91c04e3a8bc4b6aa205d,76d51dfcfd558c359f18ad36033411d0e4852805..440fc7269d71ddac734407080f701fdf2fe1861f
--- 1/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js
--- 2/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js
+++ b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js
@@@ -64,33 -65,10 +65,12 @@@ export default class LoginForm extends 
    render() {
      return (
        <div id="login_form">
 -        <h1 className="maintenance-title text-center">{translate('login.login_to_sonarqube')}</h1>
 +        <h1 className="maintenance-title text-center">
 +          {translate('login.login_to_sonarqube')}
 +        </h1>
  
          {this.props.identityProviders.length > 0 &&
-           <section className="oauth-providers">
-             <ul>
-               {this.props.identityProviders.map(identityProvider =>
-                 <li key={identityProvider.key}>
-                   <a
-                     href={`${window.baseUrl}/sessions/init/${identityProvider.key}`}
-                     style={{ backgroundColor: identityProvider.backgroundColor }}
-                     title={`Log in with ${identityProvider.name}`}>
-                     <img
-                       alt={identityProvider.name}
-                       width="20"
-                       height="20"
-                       src={window.baseUrl + identityProvider.iconPath}
-                     />
-                     <span>
-                       Log in with {identityProvider.name}
-                     </span>
-                   </a>
-                 </li>
-               )}
-             </ul>
-           </section>}
+           <OAuthProviders identityProviders={this.props.identityProviders} />}
  
          {this.state.collapsed
            ? <div className="text-center">

diff --cc server/sonar-web/src/main/less/pages/login.less
index 46780ee7c001bbe41c977649666abf6142ca4e11,a87804cb352d1c35fccb575980f2236eef3780cf..6b1224bf4adc63471b506b2ebac3da338ce9c45a
--- 1/server/sonar-web/src/main/less/pages/login.less
--- 2/server/sonar-web/src/main/less/pages/login.less
+++ b/server/sonar-web/src/main/less/pages/login.less
@@@ -94,10 -90,10 +94,11 @@@
          color: #fff;
          white-space: nowrap;
          overflow: hidden;
+         text-align: center;
          text-overflow: ellipsis;
  
 -        &:hover, &:focus {
 +        &:hover,
 +        &:focus {
            box-shadow: inset 0 0 16px rgba(0, 0, 0, 0.3);
          }
  

diff --cc sonar-core/src/main/resources/org/sonar/l10n/core.properties
Simple merge