From 42e4494efe716626ca6b5c7be19a138df2281247 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Tue, 27 Mar 2018 10:50:05 +0200
Subject: [PATCH] do not lowercase branch names

---
 .../components/nav/component/ComponentNavBranch.tsx  | 12 ++++++------
 .../__snapshots__/ComponentNavBranch-test.tsx.snap   |  4 ++--
 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
      
-- 
2.39.5