diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 3e89969f46e0a4680b631e94e0f7c2aa14792e6d..c03697a4076684b97fe28c00b016a259ca6fb8e9 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -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 diff --git a/config/feature_flags/development/boards_filtered_search.yml b/config/feature_flags/development/boards_filtered_search.yml deleted file mode 100644 index bfb4ae46414fff2afbbfa75ea388106cfebafc46..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/boards_filtered_search.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 diff --git a/ee/app/assets/javascripts/epic_boards/index.js b/ee/app/assets/javascripts/epic_boards/index.js index 748f1d634cd9d3a7da369b3066fc14605edd3d4c..a28a316de31e1d9f2e3a4052dab347ba15437b47 100644 --- a/ee/app/assets/javascripts/epic_boards/index.js +++ b/ee/app/assets/javascripts/epic_boards/index.js @@ -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({ diff --git a/ee/app/controllers/groups/epic_boards_controller.rb b/ee/app/controllers/groups/epic_boards_controller.rb index 16df2c270fdce23b6c509a29dec6890605a6d62e..556063b80e2ee52973e594c1079a25cf92fb9f8d 100644 --- a/ee/app/controllers/groups/epic_boards_controller.rb +++ b/ee/app/controllers/groups/epic_boards_controller.rb @@ -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' diff --git a/ee/spec/features/epic_boards/epic_boards_spec.rb b/ee/spec/features/epic_boards/epic_boards_spec.rb index 3f8d5838fcd9f621fd2513308e7d14c6253a8fd6..320882e21f630a2c3b3f843cd5e0720174416ed2 100644 --- a/ee/spec/features/epic_boards/epic_boards_spec.rb +++ b/ee/spec/features/epic_boards/epic_boards_spec.rb @@ -214,7 +214,6 @@ 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)