diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-25 21:11:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-25 21:11:07 +0300 |
commit | c7531da771f30a54e2220f8f62efeba4b0b1a674 (patch) | |
tree | fdcfd9dc4a29004d5c4d426365354e87f2680d49 /app/assets/javascripts/repository | |
parent | 29516285ebf20d2c9836d5263f9d3fba21d04a95 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
-rw-r--r-- | app/assets/javascripts/repository/components/blob_content_viewer.vue | 5 | ||||
-rw-r--r-- | app/assets/javascripts/repository/constants.js | 21 |
2 files changed, 24 insertions, 2 deletions
diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index c9e4aab1db1..ea64f06e1c1 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -17,7 +17,7 @@ import getRefMixin from '../mixins/get_ref'; import blobInfoQuery from '../queries/blob_info.query.graphql'; import userInfoQuery from '../queries/user_info.query.graphql'; import applicationInfoQuery from '../queries/application_info.query.graphql'; -import { DEFAULT_BLOB_INFO, TEXT_FILE_TYPE, LFS_STORAGE } from '../constants'; +import { DEFAULT_BLOB_INFO, TEXT_FILE_TYPE, LFS_STORAGE, LEGACY_FILE_TYPES } from '../constants'; import BlobButtonGroup from './blob_button_group.vue'; import ForkSuggestion from './fork_suggestion.vue'; import { loadViewer } from './blob_viewers'; @@ -132,7 +132,8 @@ export default { return this.shouldLoadLegacyViewer ? null : loadViewer(fileType, this.isUsingLfs); }, shouldLoadLegacyViewer() { - return this.viewer.fileType === TEXT_FILE_TYPE && !this.glFeatures.highlightJs; + const isTextFile = this.viewer.fileType === TEXT_FILE_TYPE && !this.glFeatures.highlightJs; + return isTextFile || LEGACY_FILE_TYPES.includes(this.blobInfo.fileType); }, legacyViewerLoaded() { return ( diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js index bb9d3180be8..2cafeed2ef4 100644 --- a/app/assets/javascripts/repository/constants.js +++ b/app/assets/javascripts/repository/constants.js @@ -86,3 +86,24 @@ export const DEFAULT_BLOB_INFO = { export const TEXT_FILE_TYPE = 'text'; export const LFS_STORAGE = 'lfs'; + +/** + * We have some features (like linking to external dependencies) that our frontend highlighter + * do not yet support. + * 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', + 'podfile', + 'podspec', + 'podspec_json', + 'cartfile', + 'godeps_json', + 'requirements_txt', + 'cargo_toml', + 'go_mod', + 'go_sum', +]; |