diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-13 18:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-13 18:09:14 +0300 |
commit | a88c31d0ea1a79ca93fad357c3eb536b5e013e44 (patch) | |
tree | b38023b2be7478fa706c7a95d08cdfad13f8d8c1 /app/assets/javascripts/repository | |
parent | affec3ced2d85697d9a21d83e811285b030705f2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
-rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 11 | ||||
-rw-r--r-- | app/assets/javascripts/repository/constants.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/repository/index.js | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index 4a823738ea1..99b7395d6e7 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -134,14 +134,11 @@ export default { commitData() { return this.glFeatures.lazyLoadCommits ? this.commitInfo : this.commit; }, - refactorBlobViewerEnabled() { - return this.glFeatures.refactorBlobViewer; - }, routerLinkTo() { const blobRouteConfig = { path: `/-/blob/${this.escapedRef}/${escapeFileUrl(this.path)}` }; const treeRouteConfig = { path: `/-/tree/${this.escapedRef}/${escapeFileUrl(this.path)}` }; - if (this.refactorBlobViewerEnabled && this.isBlob) { + if (this.isBlob) { return blobRouteConfig; } @@ -157,7 +154,7 @@ export default { return this.type === 'commit'; }, linkComponent() { - return this.isFolder || (this.refactorBlobViewerEnabled && this.isBlob) ? 'router-link' : 'a'; + return this.isFolder || this.isBlob ? 'router-link' : 'a'; }, fullPath() { return this.path.replace(new RegExp(`^${escapeRegExp(this.currentPath)}/`), ''); @@ -186,10 +183,6 @@ export default { }); }, loadBlob() { - if (!this.refactorBlobViewerEnabled) { - return; - } - this.apolloQuery(blobInfoQuery, { projectPath: this.projectPath, filePath: this.path, diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js index 2cafeed2ef4..0e80f306638 100644 --- a/app/assets/javascripts/repository/constants.js +++ b/app/assets/javascripts/repository/constants.js @@ -93,7 +93,6 @@ export const LFS_STORAGE = 'lfs'; * These are file types that we want the legacy (backend) syntax highlighter to highlight. */ export const LEGACY_FILE_TYPES = [ - 'package_json', 'gemfile', 'gemspec', 'composer_json', diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js index 8f8735a6371..1d295e18332 100644 --- a/app/assets/javascripts/repository/index.js +++ b/app/assets/javascripts/repository/index.js @@ -91,9 +91,7 @@ export default function setupVueRepositoryList() { initLastCommitApp(); - if (gon.features.refactorBlobViewer) { - initBlobControlsApp(); - } + initBlobControlsApp(); router.afterEach(({ params: { path } }) => { setTitle(path, ref, fullName); |