diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 21:18:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 21:18:16 +0300 |
commit | 9c042f0dada432de0e4144db50fd52f1d53b78c6 (patch) | |
tree | a99954bec23f9bce0bfec8245d965a9daeacf60f /app/assets/javascripts/repository | |
parent | 19ab203bec41ca29cecb3f2da23c55329bcea50e (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 | 13 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/blob_edit.vue | 46 |
2 files changed, 8 insertions, 51 deletions
diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 52963b49f68..13fd4f1d1f5 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -10,11 +10,11 @@ import { isLoggedIn } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import WebIdeLink from '~/vue_shared/components/web_ide_link.vue'; import getRefMixin from '../mixins/get_ref'; import blobInfoQuery from '../queries/blob_info.query.graphql'; import { DEFAULT_BLOB_INFO, TEXT_FILE_TYPE, LFS_STORAGE } from '../constants'; import BlobButtonGroup from './blob_button_group.vue'; -import BlobEdit from './blob_edit.vue'; import ForkSuggestion from './fork_suggestion.vue'; import { loadViewer } from './blob_viewers'; @@ -24,12 +24,12 @@ export default { }, components: { BlobHeader, - BlobEdit, BlobButtonGroup, BlobContent, GlLoadingIcon, GlButton, ForkSuggestion, + WebIdeLink, }, mixins: [getRefMixin, glFeatureFlagMixin()], inject: { @@ -213,12 +213,15 @@ export default { @viewer-changed="switchViewer" > <template #actions> - <blob-edit + <web-ide-link v-if="!blobInfo.archived" :show-edit-button="!isBinaryFileType" - :edit-path="blobInfo.editBlobPath" - :web-ide-path="blobInfo.ideEditPath" + class="gl-mr-3" + :edit-url="blobInfo.editBlobPath" + :web-ide-url="blobInfo.ideEditPath" :needs-to-fork="showForkSuggestion" + is-blob + disable-fork-modal @edit="editBlob" /> diff --git a/app/assets/javascripts/repository/components/blob_edit.vue b/app/assets/javascripts/repository/components/blob_edit.vue deleted file mode 100644 index 2ba0ab968bf..00000000000 --- a/app/assets/javascripts/repository/components/blob_edit.vue +++ /dev/null @@ -1,46 +0,0 @@ -<script> -import WebIdeLink from '~/vue_shared/components/web_ide_link.vue'; - -export default { - components: { - WebIdeLink, - }, - props: { - showEditButton: { - type: Boolean, - required: true, - }, - editPath: { - type: String, - required: true, - }, - webIdePath: { - type: String, - required: true, - }, - needsToFork: { - type: Boolean, - required: false, - default: false, - }, - }, - methods: { - onEdit(target) { - this.$emit('edit', target); - }, - }, -}; -</script> - -<template> - <web-ide-link - :show-edit-button="showEditButton" - class="gl-mr-3" - :edit-url="editPath" - :web-ide-url="webIdePath" - :needs-to-fork="needsToFork" - :is-blob="true" - disable-fork-modal - @edit="onEdit" - /> -</template> |