diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-28 09:07:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-28 09:07:52 +0300 |
commit | c222aa089016e16374c92fa868c920a239278ef5 (patch) | |
tree | 9859b21cf90150c43035bc6086011c6f31d460d3 /app/assets/javascripts/repository | |
parent | e566469060dfa8fdf91567cf4df400496018ed8f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
-rw-r--r-- | app/assets/javascripts/repository/components/breadcrumbs.vue | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index 08faf19d12a..bc9f82d985b 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -9,7 +9,6 @@ import { } from '@gitlab/ui'; import permissionsQuery from 'shared_queries/repository/permissions.query.graphql'; import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { __ } from '../../locale'; import getRefMixin from '../mixins/get_ref'; import projectPathQuery from '../queries/project_path.query.graphql'; @@ -58,7 +57,7 @@ export default { directives: { GlModal: GlModalDirective, }, - mixins: [getRefMixin, glFeatureFlagsMixin()], + mixins: [getRefMixin], props: { currentPath: { type: String, @@ -176,11 +175,7 @@ export default { return this.canEditTree && !this.$apollo.queries.userPermissions.loading; }, showNewDirectoryModal() { - return ( - this.glFeatures.newDirModal && - this.canEditTree && - !this.$apollo.queries.userPermissions.loading - ); + return this.canEditTree && !this.$apollo.queries.userPermissions.loading; }, dropdownItems() { const items = []; @@ -209,24 +204,13 @@ export default { }, ); - if (this.glFeatures.newDirModal) { - items.push({ - attrs: { - href: '#modal-create-new-dir', - }, - text: __('New directory'), - modalId: NEW_DIRECTORY_MODAL_ID, - }); - } else { - items.push({ - attrs: { - href: '#modal-create-new-dir', - 'data-target': '#modal-create-new-dir', - 'data-toggle': 'modal', - }, - text: __('New directory'), - }); - } + items.push({ + attrs: { + href: '#modal-create-new-dir', + }, + text: __('New directory'), + modalId: NEW_DIRECTORY_MODAL_ID, + }); } else if (this.canCreateMrFromFork) { items.push( { |