diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-27 00:09:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-27 00:09:48 +0300 |
commit | f57bd3d34851023628f4b2f3402720f8f404641f (patch) | |
tree | b6eebadd432f5dc0dc9a5e0a612aae527ed8ed4c /app/assets/javascripts/repository | |
parent | cafc99870a5167530f45ddcdee98afa86a27a0f7 (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 | 9 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 87b3aa91c4a..a34ed065323 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -80,8 +80,8 @@ export default { projectPath: this.projectPath, filePath: this.path, ref: this.originalBranch || this.ref, - shouldFetchRawText: Boolean(this.glFeatures.highlightJs), refType: this.refType?.toUpperCase() || null, + shouldFetchRawText: true, }; return queryVariables; @@ -193,8 +193,7 @@ export default { ); }, shouldLoadLegacyViewer() { - const isTextFile = this.viewer.fileType === TEXT_FILE_TYPE && !this.glFeatures.highlightJs; - return isTextFile || LEGACY_FILE_TYPES.includes(this.blobInfo.fileType) || this.useFallback; + return LEGACY_FILE_TYPES.includes(this.blobInfo.fileType) || this.useFallback; }, legacyViewerLoaded() { return ( @@ -355,7 +354,7 @@ export default { :active-viewer-type="viewer.type" :has-render-error="hasRenderError" :show-path="false" - :override-copy="glFeatures.highlightJs" + :override-copy="true" @viewer-changed="handleViewerChanged" @copy="onCopy" > @@ -428,7 +427,7 @@ export default { :code-navigation-path="blobInfo.codeNavigationPath" :blob-path="blobInfo.path" :path-prefix="blobInfo.projectBlobPathRoot" - :wrap-text-nodes="glFeatures.highlightJs" + :wrap-text-nodes="true" /> </div> <ai-genie diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index c6c14c26fba..5c994d7fe1a 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -16,7 +16,6 @@ import { buildURLwithRefType, joinPaths } from '~/lib/utils/url_utility'; import { TREE_PAGE_SIZE, ROW_APPEAR_DELAY } from '~/repository/constants'; import FileIcon from '~/vue_shared/components/file_icon.vue'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import blobInfoQuery from 'shared_queries/repository/blob_info.query.graphql'; import getRefMixin from '../../mixins/get_ref'; @@ -36,7 +35,7 @@ export default { GlHoverLoad: GlHoverLoadDirective, SafeHtml, }, - mixins: [getRefMixin, glFeatureFlagMixin()], + mixins: [getRefMixin], inject: ['refType'], props: { commitInfo: { @@ -176,7 +175,7 @@ export default { filePath: this.path, ref: this.ref, refType: this.refType?.toUpperCase() || null, - shouldFetchRawText: Boolean(this.glFeatures.highlightJs), + shouldFetchRawText: true, }); }, apolloQuery(query, variables) { |