Commit 49bbf5d0 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'remove-ff-import-requirements' into 'master'

Remove feature flag for import requirements

See merge request gitlab-org/gitlab!53129
parents ae95ccc1 27b92e2d
......@@ -26,11 +26,6 @@ export default {
type: Boolean,
required: true,
},
showUploadCsv: {
type: Boolean,
required: false,
default: false,
},
},
computed: {
emptyStateTitle() {
......@@ -62,7 +57,6 @@ export default {
__('New requirement')
}}</gl-button>
<gl-button
v-if="showUploadCsv"
category="secondary"
variant="default"
@click="$emit('click-import-requirements')"
......
......@@ -11,7 +11,6 @@ import { updateHistory, setUrlParams } from '~/lib/utils/url_utility';
import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
import { DEFAULT_LABEL_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import projectRequirements from '../queries/projectRequirements.query.graphql';
import projectRequirementsCount from '../queries/projectRequirementsCount.query.graphql';
......@@ -47,7 +46,7 @@ export default {
ImportRequirementsModal,
ExportRequirementsModal,
},
mixins: [glFeatureFlagsMixin(), Tracking.mixin()],
mixins: [Tracking.mixin()],
props: {
projectPath: {
type: String,
......@@ -633,7 +632,6 @@ export default {
:filter-by="filterBy"
:requirements-count="requirementsCount"
:show-create-form="showRequirementCreateDrawer"
:show-upload-csv="glFeatures.importRequirementsCsv"
:can-create-requirement="canCreateRequirement"
@click-tab="handleTabClick"
@click-new-requirement="handleNewRequirementClick"
......@@ -674,7 +672,6 @@ export default {
:empty-state-path="emptyStatePath"
:requirements-count="requirementsCount"
:can-create-requirement="canCreateRequirement"
:show-upload-csv="glFeatures.importRequirementsCsv"
@click-new-requirement="handleNewRequirementClick"
@click-import-requirements="handleImportRequirementsClick"
/>
......@@ -710,14 +707,8 @@ export default {
class="gl-pagination gl-mt-3"
@input="handlePageChange"
/>
<import-requirements-modal
v-if="glFeatures.importRequirementsCsv"
ref="modal"
:project-path="projectPath"
@import="importCsv"
/>
<import-requirements-modal ref="modal" :project-path="projectPath" @import="importCsv" />
<export-requirements-modal
v-if="glFeatures.importRequirementsCsv"
ref="exportModal"
:requirement-count="totalRequirementsForCurrentTab"
:email="currentUserEmail"
......
......@@ -32,11 +32,6 @@ export default {
type: Boolean,
required: false,
},
showUploadCsv: {
type: Boolean,
required: false,
default: false,
},
},
computed: {
isOpenTab() {
......@@ -91,7 +86,6 @@ export default {
<div v-if="isOpenTab && canCreateRequirement" class="nav-controls">
<gl-button-group>
<gl-button
v-if="showUploadCsv"
v-gl-tooltip
:title="__('Export as CSV')"
category="secondary"
......@@ -100,7 +94,6 @@ export default {
@click="$emit('click-export-requirements')"
/>
<gl-button
v-if="showUploadCsv"
v-gl-tooltip
:title="__('Import requirements')"
category="secondary"
......
......@@ -11,7 +11,6 @@ const createComponent = ({
requirementsCount = mockRequirementsCount,
showCreateForm = false,
canCreateRequirement = true,
showUploadCsv = true,
} = {}) =>
shallowMount(RequirementsTabs, {
propsData: {
......@@ -19,7 +18,6 @@ const createComponent = ({
requirementsCount,
showCreateForm,
canCreateRequirement,
showUploadCsv,
},
stubs: {
GlTabs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment