From 7f8330873c1a5860b8a9a52d111083a65d210249 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 18 Dec 2019 21:07:37 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/repository/components/breadcrumbs.vue      | 4 ++--
 app/assets/javascripts/repository/components/table/parent_row.vue | 2 +-
 app/assets/javascripts/repository/components/table/row.vue        | 2 +-
 app/assets/javascripts/repository/router.js                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts/repository')

diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue
index e1382aa86d9..f6b9ea5d30d 100644
--- a/app/assets/javascripts/repository/components/breadcrumbs.vue
+++ b/app/assets/javascripts/repository/components/breadcrumbs.vue
@@ -104,10 +104,10 @@ export default {
             return acc.concat({
               name,
               path,
-              to: `/-/tree/${this.ref}${path}`,
+              to: `/tree/${this.ref}${path}`,
             });
           },
-          [{ name: this.projectShortPath, path: '/', to: `/-/tree/${this.ref}/` }],
+          [{ name: this.projectShortPath, path: '/', to: `/tree/${this.ref}/` }],
         );
     },
     canCreateMrFromFork() {
diff --git a/app/assets/javascripts/repository/components/table/parent_row.vue b/app/assets/javascripts/repository/components/table/parent_row.vue
index 38aa672bc1c..3c39f404226 100644
--- a/app/assets/javascripts/repository/components/table/parent_row.vue
+++ b/app/assets/javascripts/repository/components/table/parent_row.vue
@@ -15,7 +15,7 @@ export default {
       const splitArray = this.path.split('/');
       splitArray.pop();
 
-      return { path: `/-/tree/${this.commitRef}/${splitArray.join('/')}` };
+      return { path: `/tree/${this.commitRef}/${splitArray.join('/')}` };
     },
   },
   methods: {
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index 57dd08c2142..cf0457a2abf 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -84,7 +84,7 @@ export default {
   },
   computed: {
     routerLinkTo() {
-      return this.isFolder ? { path: `/-/tree/${this.ref}/${this.path}` } : null;
+      return this.isFolder ? { path: `/tree/${this.ref}/${this.path}` } : null;
     },
     iconName() {
       return `fa-${getIconName(this.type, this.path)}`;
diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js
index fa544444be8..ebf0a7091ea 100644
--- a/app/assets/javascripts/repository/router.js
+++ b/app/assets/javascripts/repository/router.js
@@ -12,7 +12,7 @@ export default function createRouter(base, baseRef) {
     base: joinPaths(gon.relative_url_root || '', base),
     routes: [
       {
-        path: `/-/tree/${baseRef}(/.*)?`,
+        path: `/tree/${baseRef}(/.*)?`,
         name: 'treePath',
         component: TreePage,
         props: route => ({
-- 
cgit v1.2.3