diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 03:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 03:09:31 +0300 |
commit | 2b963521be830926618a6d4f3ed8fb7fef8d0144 (patch) | |
tree | dece08ed234b4c8003085717ccaa60cd55ecb13f /app/assets/javascripts/repository | |
parent | 59223e71ada4330f2219e99e660cc8b6d470fc16 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
-rw-r--r-- | app/assets/javascripts/repository/commits_service.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/table/index.vue | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/repository/commits_service.js b/app/assets/javascripts/repository/commits_service.js index 7f177da3ddd..5fd9cfd4e53 100644 --- a/app/assets/javascripts/repository/commits_service.js +++ b/app/assets/javascripts/repository/commits_service.js @@ -35,7 +35,7 @@ const fetchData = (projectPath, path, ref, offset) => { gon.relative_url_root || '/', projectPath, '/-/refs/', - encodeURIComponent(ref), + ref, '/logs_tree/', encodeURIComponent(removeLeadingSlash(path)), ); diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue index 8faac62d4bb..41f7a4b147f 100644 --- a/app/assets/javascripts/repository/components/table/index.vue +++ b/app/assets/javascripts/repository/components/table/index.vue @@ -2,7 +2,6 @@ import { GlSkeletonLoader, GlButton } from '@gitlab/ui'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { sprintf, __ } from '~/locale'; -import { cleanLeadingSeparator } from '~/lib/utils/url_utility'; import getRefMixin from '../../mixins/get_ref'; import projectPathQuery from '../../queries/project_path.query.graphql'; import TableHeader from './header.vue'; @@ -104,14 +103,13 @@ export default { return this.rowNumbers[key]; }, - getCommit(flatPath, type) { + getCommit(fileName, type) { if (!this.glFeatures.lazyLoadCommits) { return {}; } return this.commits.find( - (commitEntry) => - cleanLeadingSeparator(commitEntry.filePath) === flatPath && commitEntry.type === type, + (commitEntry) => commitEntry.fileName === fileName && commitEntry.type === type, ); }, }, @@ -154,7 +152,7 @@ export default { :loading-path="loadingPath" :total-entries="totalEntries" :row-number="generateRowNumber(entry.flatPath, entry.id, index)" - :commit-info="getCommit(entry.flatPath, entry.type)" + :commit-info="getCommit(entry.name, entry.type)" v-on="$listeners" /> </template> |