Commit c9db85d0 authored by Dmytro Zaporozhets (DZ)'s avatar Dmytro Zaporozhets (DZ)

Merge branch 'remove-filter-pipelines-search-flag' into 'master'

Remove feature flag filter_pipelines_search

See merge request gitlab-org/gitlab!45698
parents 7dd433df 2dc3bc19
...@@ -13,7 +13,6 @@ import CIPaginationMixin from '~/vue_shared/mixins/ci_pagination_api_mixin'; ...@@ -13,7 +13,6 @@ import CIPaginationMixin from '~/vue_shared/mixins/ci_pagination_api_mixin';
import PipelinesFilteredSearch from './pipelines_filtered_search.vue'; import PipelinesFilteredSearch from './pipelines_filtered_search.vue';
import { validateParams } from '../../utils'; import { validateParams } from '../../utils';
import { ANY_TRIGGER_AUTHOR, RAW_TEXT_WARNING, FILTER_TAG_IDENTIFIER } from '../../constants'; import { ANY_TRIGGER_AUTHOR, RAW_TEXT_WARNING, FILTER_TAG_IDENTIFIER } from '../../constants';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
export default { export default {
components: { components: {
...@@ -23,7 +22,7 @@ export default { ...@@ -23,7 +22,7 @@ export default {
PipelinesFilteredSearch, PipelinesFilteredSearch,
GlIcon, GlIcon,
}, },
mixins: [pipelinesMixin, CIPaginationMixin, glFeatureFlagsMixin()], mixins: [pipelinesMixin, CIPaginationMixin],
props: { props: {
store: { store: {
type: Object, type: Object,
...@@ -209,9 +208,6 @@ export default { ...@@ -209,9 +208,6 @@ export default {
}, },
]; ];
}, },
canFilterPipelines() {
return this.glFeatures.filterPipelinesSearch;
},
validatedParams() { validatedParams() {
return validateParams(this.params); return validateParams(this.params);
}, },
...@@ -306,7 +302,6 @@ export default { ...@@ -306,7 +302,6 @@ export default {
</div> </div>
<pipelines-filtered-search <pipelines-filtered-search
v-if="canFilterPipelines"
:project-id="projectId" :project-id="projectId"
:params="validatedParams" :params="validatedParams"
@filterPipelines="filterPipelines" @filterPipelines="filterPipelines"
......
...@@ -12,7 +12,6 @@ class Projects::PipelinesController < Projects::ApplicationController ...@@ -12,7 +12,6 @@ class Projects::PipelinesController < Projects::ApplicationController
before_action :authorize_create_pipeline!, only: [:new, :create, :config_variables] before_action :authorize_create_pipeline!, only: [:new, :create, :config_variables]
before_action :authorize_update_pipeline!, only: [:retry, :cancel] before_action :authorize_update_pipeline!, only: [:retry, :cancel]
before_action do before_action do
push_frontend_feature_flag(:filter_pipelines_search, project, default_enabled: true)
push_frontend_feature_flag(:dag_pipeline_tab, project, default_enabled: true) push_frontend_feature_flag(:dag_pipeline_tab, project, default_enabled: true)
push_frontend_feature_flag(:pipelines_security_report_summary, project) push_frontend_feature_flag(:pipelines_security_report_summary, project)
push_frontend_feature_flag(:new_pipeline_form, project) push_frontend_feature_flag(:new_pipeline_form, project)
......
---
name: filter_pipelines_search
introduced_by_url:
rollout_issue_url:
group:
type: development
default_enabled: true
...@@ -74,7 +74,6 @@ describe('Pipelines', () => { ...@@ -74,7 +74,6 @@ describe('Pipelines', () => {
const createComponent = (props = defaultProps, methods) => { const createComponent = (props = defaultProps, methods) => {
wrapper = mount(PipelinesComponent, { wrapper = mount(PipelinesComponent, {
provide: { glFeatures: { filterPipelinesSearch: true } },
propsData: { propsData: {
store: new Store(), store: new Store(),
projectId: '21', projectId: '21',
......
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