From 43b4b3e2d2ddebc0a89b94a8251c162ec5719780 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 20 Mar 2020 12:10:03 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/repository/log_tree.js | 6 +++---
 app/assets/javascripts/repository/router.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js
index ade92cc92e0..8cad4a14f31 100644
--- a/app/assets/javascripts/repository/log_tree.js
+++ b/app/assets/javascripts/repository/log_tree.js
@@ -27,9 +27,9 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
 
   fetchpromise = axios
     .get(
-      `${gon.relative_url_root}/${projectPath}/-/refs/${escape(ref)}/logs_tree/${encodeURIComponent(
-        path.replace(/^\//, ''),
-      )}`,
+      `${gon.relative_url_root}/${projectPath}/-/refs/${encodeURIComponent(
+        ref,
+      )}/logs_tree/${encodeURIComponent(path.replace(/^\//, ''))}`,
       {
         params: { format: 'json', offset },
       },
diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js
index 2386773699c..d74447dd566 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/${escape(baseRef)}/:path*`,
+        path: `(/-)?/tree/(${encodeURIComponent(baseRef)}|${baseRef})/:path*`,
         name: 'treePath',
         component: TreePage,
         props: route => ({
-- 
cgit v1.2.3