diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 15:10:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 15:10:03 +0300 |
| commit | 43b4b3e2d2ddebc0a89b94a8251c162ec5719780 (patch) | |
| tree | 8a21146370cfd1b24b25cfcacef53e889746f5aa /app/assets/javascripts/repository | |
| parent | 196ada0844fff7642463fbd08a44609a1e1fa713 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
| -rw-r--r-- | app/assets/javascripts/repository/log_tree.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/router.js | 2 |
2 files changed, 4 insertions, 4 deletions
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 => ({ |