diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
| commit | 1363ca12f1f07c634647cf55c4c16b7401098673 (patch) | |
| tree | d932caf09c8148322edb51ae954ed159ff7d00f8 /app/assets/javascripts/repository | |
| parent | 6763d2787670bc03a36a8eb601703e88fc70dece (diff) | |
| download | gitlab-ce-1363ca12f1f07c634647cf55c4c16b7401098673.tar.gz | |
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 | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index be70bfc7399..03766c4877e 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -1,6 +1,6 @@ <script> import { GlDropdown, GlDropdownDivider, GlDropdownHeader, GlDropdownItem } from '@gitlab/ui'; -import { joinPaths } from '~/lib/utils/url_utility'; +import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; import { __ } from '../../locale'; import Icon from '../../vue_shared/components/icon.vue'; import getRefMixin from '../mixins/get_ref'; @@ -103,7 +103,7 @@ export default { .filter(p => p !== '') .reduce( (acc, name, i) => { - const path = joinPaths(i > 0 ? acc[i].path : '', encodeURIComponent(name)); + const path = joinPaths(i > 0 ? acc[i].path : '', escapeFileUrl(name)); return acc.concat({ name, diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index b81e6a38b4c..f3e6e3686a3 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -1,7 +1,7 @@ <script> import { escapeRegExp } from 'lodash'; import { GlBadge, GlLink, GlSkeletonLoading, GlTooltipDirective, GlLoadingIcon } from '@gitlab/ui'; -import { visitUrl } from '~/lib/utils/url_utility'; +import { visitUrl, escapeFileUrl } from '~/lib/utils/url_utility'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import Icon from '~/vue_shared/components/icon.vue'; import { getIconName } from '../../utils/icon'; @@ -92,7 +92,7 @@ export default { computed: { routerLinkTo() { return this.isFolder - ? { path: `/-/tree/${escape(this.ref)}/${encodeURIComponent(this.path)}` } + ? { path: `/-/tree/${escape(this.ref)}/${escapeFileUrl(this.path)}` } : null; }, iconName() { |