aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <stas.vilchik@sonarsource.com>2018-03-27 10:50:05 +0200
committerSonarTech <sonartech@sonarsource.com>2018-03-28 20:20:58 +0200
commit42e4494efe716626ca6b5c7be19a138df2281247 (patch)
treed81832c0dedc55edbc62fc94a40538ff57159796
parent0515ca13f5217af62237cef39c3218f0efc5c7a3 (diff)
downloadsonarqube-42e4494efe716626ca6b5c7be19a138df2281247.tar.gz
sonarqube-42e4494efe716626ca6b5c7be19a138df2281247.zip
do not lowercase branch names
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranch.tsx12
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranch-test.tsx.snap4
2 files changed, 8 insertions, 8 deletions
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranch.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranch.tsx
index d51dadbd73d..e640d448159 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranch.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranch.tsx
@@ -144,20 +144,20 @@ export default class ComponentNavBranch extends React.PureComponent<Props, State
const { currentBranchLike } = this.props;
if (isShortLivingBranch(currentBranchLike)) {
return currentBranchLike.isOrphan ? (
- <span className="note big-spacer-left text-lowercase">
+ <span className="note big-spacer-left">
{translate('branches.orphan_branch')}
<Tooltip overlay={translate('branches.orphan_branches.tooltip')}>
<i className="icon-help spacer-left" />
</Tooltip>
</span>
) : (
- <span className="note big-spacer-left text-lowercase">
+ <span className="note big-spacer-left">
{translate('from')} <strong>{currentBranchLike.mergeBranch}</strong>
</span>
);
} else if (isPullRequest(currentBranchLike)) {
return (
- <span className="note big-spacer-left text-lowercase">
+ <span className="note big-spacer-left">
<FormattedMessage
defaultMessage={translate('branches.pull_request.for_merge_into_x_from_y')}
id="branches.pull_request.for_merge_into_x_from_y"
@@ -180,8 +180,8 @@ export default class ComponentNavBranch extends React.PureComponent<Props, State
</a>
<BubblePopupHelper
isOpen={this.state.singleBranchPopupOpen}
- position="bottomleft"
popup={<SingleBranchHelperPopup />}
+ position="bottomleft"
togglePopup={this.toggleSingleBranchPopup}
/>
</div>
@@ -194,8 +194,8 @@ export default class ComponentNavBranch extends React.PureComponent<Props, State
</a>
<BubblePopupHelper
isOpen={this.state.noBranchSupportPopupOpen}
- position="bottomleft"
popup={<NoBranchSupportPopup />}
+ position="bottomleft"
togglePopup={this.toggleNoBranchSupportPopup}
/>
</div>
@@ -241,7 +241,7 @@ export default class ComponentNavBranch extends React.PureComponent<Props, State
})}>
<a className="link-base-color link-no-underline" href="#" onClick={this.handleClick}>
<BranchIcon branchLike={currentBranchLike} className="little-spacer-right" />
- <Tooltip overlay={displayName} mouseEnterDelay={1}>
+ <Tooltip mouseEnterDelay={1} overlay={displayName}>
<span className="text-limited text-top">{displayName}</span>
</Tooltip>
<i className="icon-dropdown little-spacer-left" />
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranch-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranch-test.tsx.snap
index 5f53fb0b983..67e5dbf7ef4 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranch-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranch-test.tsx.snap
@@ -114,7 +114,7 @@ exports[`renders pull request 1`] = `
/>
</a>
<span
- className="note big-spacer-left text-lowercase"
+ className="note big-spacer-left"
>
<FormattedMessage
defaultMessage="branches.pull_request.for_merge_into_x_from_y"
@@ -176,7 +176,7 @@ exports[`renders short-living branch 1`] = `
/>
</a>
<span
- className="note big-spacer-left text-lowercase"
+ className="note big-spacer-left"
>
from