diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 01:40:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 01:40:25 +0300 |
| commit | 20abacca26d629e533c41e98600d903be8d13441 (patch) | |
| tree | 7f879eefe36f0426f181b29cddbb9816e747d1e0 /app/assets/javascripts | |
| parent | 8bdbf220176b3c4df35dbf01da3dc8b2d507f351 (diff) | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index fdd6b4eb87a..d78b2d9d962 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -108,14 +108,14 @@ export default { return acc.concat({ name, path, - to: `/-/tree/${joinPaths(encodeURIComponent(this.ref), path)}`, + to: `/-/tree/${joinPaths(escapeFileUrl(this.ref), path)}`, }); }, [ { name: this.projectShortPath, path: '/', - to: `/-/tree/${encodeURIComponent(this.ref)}/`, + to: `/-/tree/${escapeFileUrl(this.ref)}/`, }, ], ); diff --git a/app/assets/javascripts/repository/components/table/parent_row.vue b/app/assets/javascripts/repository/components/table/parent_row.vue index 32bdda2e0a8..0a8ee5f2fc5 100644 --- a/app/assets/javascripts/repository/components/table/parent_row.vue +++ b/app/assets/javascripts/repository/components/table/parent_row.vue @@ -1,5 +1,6 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; +import { escapeFileUrl } from '~/lib/utils/url_utility'; export default { components: { @@ -28,7 +29,7 @@ export default { return splitArray.map(p => encodeURIComponent(p)).join('/'); }, parentRoute() { - return { path: `/-/tree/${encodeURIComponent(this.commitRef)}/${this.parentPath}` }; + return { path: `/-/tree/${escapeFileUrl(this.commitRef)}/${this.parentPath}` }; }, }, methods: { diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index d9ef6eec6f1..6bd1c702a82 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -99,7 +99,7 @@ export default { computed: { routerLinkTo() { return this.isFolder - ? { path: `/-/tree/${encodeURIComponent(this.ref)}/${escapeFileUrl(this.path)}` } + ? { path: `/-/tree/${escapeFileUrl(this.ref)}/${escapeFileUrl(this.path)}` } : null; }, isFolder() { diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js index d74447dd566..b2636f910fe 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/(${encodeURIComponent(baseRef)}|${baseRef})/:path*`, + path: `(/-)?/tree/(${encodeURIComponent(baseRef).replace(/%2F/g, '/')}|${baseRef})/:path*`, name: 'treePath', component: TreePage, props: route => ({ |