From 7ea2a06b1e1c493f183d0be9360b62c2b0ee9869 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 29 Mar 2019 10:34:29 +0100
Subject: [PATCH] fixed branchesRegex for branch/name/changesets

---
 .../src/repos/changesets/ChangesetButtonGroup.js       | 10 ++++------
 scm-ui/src/repos/containers/RepositoryRoot.js          |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
index 971f5bf44a..04df747c1a 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
@@ -11,11 +11,10 @@ type Props = {
   changeset: Changeset,
 
   // context props
-  t: (string) => string
-}
+  t: string => string
+};
 
 class ChangesetButtonGroup extends React.Component<Props> {
-
   render() {
     const { repository, changeset, t } = this.props;
 
@@ -26,7 +25,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
       <ButtonGroup className="is-pulled-right">
         <Button link={changesetLink}>
           <span className="icon">
-            <i className="fas fa-exchange-alt"></i>
+            <i className="fas fa-exchange-alt" />
           </span>
           <span className="is-hidden-mobile is-hidden-tablet-only">
             {t("changeset.buttons.details")}
@@ -34,7 +33,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
         </Button>
         <Button link={sourcesLink}>
           <span className="icon">
-            <i className="fas fa-code"></i>
+            <i className="fas fa-code" />
           </span>
           <span className="is-hidden-mobile is-hidden-tablet-only">
             {t("changeset.buttons.sources")}
@@ -43,7 +42,6 @@ class ChangesetButtonGroup extends React.Component<Props> {
       </ButtonGroup>
     );
   }
-
 }
 
 export default translate("repos")(ChangesetButtonGroup);
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 23307fbb2c..c1b14f4086 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -77,7 +77,7 @@ class RepositoryRoot extends React.Component<Props> {
 
   matchesBranches = (route: any) => {
     const url = this.matchedUrl();
-    const regex = new RegExp(`${url}?/?/branch?.*`);
+    const regex = new RegExp(`${url}(/branch)?/?[^/]*/info?.*`);
     return route.location.pathname.match(regex);
   };