From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Mon, 24 Jul 2017 14:30:26 +0000 (+0200)
Subject: Merge branch 'branch-6.5'
X-Git-Tag: 6.6-RC1~836
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d529ebf625cb4285926aff76d5e548ecbc8fceed;p=sonarqube.git

Merge branch 'branch-6.5'
---

d529ebf625cb4285926aff76d5e548ecbc8fceed
diff --cc server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
index 64f7eb6504c,d7a6b741530..16ad05c181a
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
@@@ -139,13 -147,12 +147,13 @@@ export default class OrganizationStep e
            })}
          />
          {translate('onboarding.organization.my_personal_organization')}
 -        <span className="note spacer-left">{this.state.personalOrganization}</span>
 +        <span className="note spacer-left">
-           {this.props.currentUser.login}
++          {this.state.personalOrganization}
 +        </span>
        </a>
 -    </div>
 -  );
 +    </div>;
  
 -  renderExistingOrganizationOption = () => (
 +  renderExistingOrganizationOption = () =>
      <div className="big-spacer-top">
        <a
          className="js-existing link-base-color link-no-underline"