diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 18:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 18:08:56 +0300 |
| commit | 17ab40ca089e1aef61a83f77ab6df62a72f6ce06 (patch) | |
| tree | 8eb149293eee90ec2750b6ac5e46a111a806424e /app/assets/javascripts/repository | |
| parent | 66d4203791a01fdedf668a78818a229ea2c07aad (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
| -rw-r--r-- | app/assets/javascripts/repository/components/breadcrumbs.vue | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/log_tree.js | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index 751565ad542..be70bfc7399 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -1,5 +1,6 @@ <script> import { GlDropdown, GlDropdownDivider, GlDropdownHeader, GlDropdownItem } from '@gitlab/ui'; +import { joinPaths } from '~/lib/utils/url_utility'; import { __ } from '../../locale'; import Icon from '../../vue_shared/components/icon.vue'; import getRefMixin from '../mixins/get_ref'; @@ -102,12 +103,12 @@ export default { .filter(p => p !== '') .reduce( (acc, name, i) => { - const path = `${i > 0 ? acc[i].path : ''}/${name}`; + const path = joinPaths(i > 0 ? acc[i].path : '', encodeURIComponent(name)); return acc.concat({ name, path, - to: `/-/tree/${escape(this.ref)}${escape(path)}`, + to: `/-/tree/${joinPaths(escape(this.ref), path)}`, }); }, [ diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index c905c39bbba..b81e6a38b4c 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -91,7 +91,9 @@ export default { }, computed: { routerLinkTo() { - return this.isFolder ? { path: `/-/tree/${escape(this.ref)}/${escape(this.path)}` } : null; + return this.isFolder + ? { path: `/-/tree/${escape(this.ref)}/${encodeURIComponent(this.path)}` } + : null; }, iconName() { return `fa-${getIconName(this.type, this.path)}`; @@ -141,6 +143,7 @@ export default { <i v-else :aria-label="type" role="img" :class="iconName" class="fa fa-fw"></i> <component :is="linkComponent" + ref="link" :to="routerLinkTo" :href="url" class="str-truncated" diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js index 192e410b36f..ade92cc92e0 100644 --- a/app/assets/javascripts/repository/log_tree.js +++ b/app/assets/javascripts/repository/log_tree.js @@ -27,7 +27,7 @@ export function fetchLogsTree(client, path, offset, resolver = null) { fetchpromise = axios .get( - `${gon.relative_url_root}/${projectPath}/-/refs/${escape(ref)}/logs_tree/${escape( + `${gon.relative_url_root}/${projectPath}/-/refs/${escape(ref)}/logs_tree/${encodeURIComponent( path.replace(/^\//, ''), )}`, { |