Commit 548fdb48 authored by Etienne Baqué's avatar Etienne Baqué

Merge branch 'ss/rm-boards-ff' into 'master'

Rm feature flag for epics filtered search [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!61642
parents 11eace2a e838de4e
......@@ -23,7 +23,7 @@
- checkbox_id = 'check-all-issues'
%label.gl-sr-only{ for: checkbox_id }= _('Select all')
= check_box_tag checkbox_id, nil, false, class: "check-all-issues left"
- if Feature.enabled?(:boards_filtered_search, @group) && is_epic_board
- if is_epic_board
#js-board-filtered-search{ data: { full_path: @group&.full_path } }
- else
.issues-other-filters.filtered-search-wrapper.d-flex.flex-column.flex-md-row
......
---
name: boards_filtered_search
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54641
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322778
milestone: '13.10'
type: development
group: group::project management
default_enabled: false
......@@ -7,6 +7,7 @@ import Vue from 'vue';
import VueApollo from 'vue-apollo';
import { mapActions, mapState } from 'vuex';
import initFilteredSearch from 'ee/boards/epic_filtered_search';
import { fullEpicBoardId, transformBoardConfig } from 'ee_component/boards/boards_util';
import BoardSidebar from 'ee_component/boards/components/board_sidebar';
import toggleLabels from 'ee_component/boards/toggle_labels';
......@@ -55,13 +56,7 @@ export default () => {
}
});
if (gon?.features?.boardsFilteredSearch) {
import('ee/boards/epic_filtered_search')
.then(({ default: initFilteredSearch }) => {
initFilteredSearch(apolloProvider);
})
.catch(() => {});
}
initFilteredSearch(apolloProvider);
// eslint-disable-next-line no-new
new Vue({
......
......@@ -10,7 +10,6 @@ class Groups::EpicBoardsController < Groups::ApplicationController
before_action :assign_endpoint_vars
before_action do
push_frontend_feature_flag(:epic_boards, group, default_enabled: :yaml)
push_frontend_feature_flag(:boards_filtered_search, group)
end
track_redis_hll_event :index, :show, name: 'g_project_management_users_viewing_epic_boards'
......
......@@ -214,7 +214,6 @@ RSpec.describe 'epic boards', :js do
context 'filtered search' do
before do
stub_licensed_features(epics: true)
stub_feature_flags(boards_filtered_search: true)
group.add_guest(user)
sign_in(user)
......
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