diff --git a/config/feature_flags/ops/global_search_epics_tab.yml b/config/feature_flags/ops/global_search_epics_tab.yml index 42067e9ad930105158b5e9c5fa9caec4b5f359a3..965f77e313301c2935249fefdb44d8ba283ae836 100644 --- a/config/feature_flags/ops/global_search_epics_tab.yml +++ b/config/feature_flags/ops/global_search_epics_tab.yml @@ -5,4 +5,4 @@ rollout_issue_url: milestone: '16.5' type: ops group: group::global search -default_enabled: false +default_enabled: true diff --git a/ee/app/models/ee/epic.rb b/ee/app/models/ee/epic.rb index c9806e2031c76ed37e5eff462c0c5cb54dca7734..f706b55143e8e001763f83147152235d4fa3e920 100644 --- a/ee/app/models/ee/epic.rb +++ b/ee/app/models/ee/epic.rb @@ -334,8 +334,6 @@ def search(query) end def elasticsearch_available? - return false unless ::Feature.enabled?(:elastic_index_epics) - ::Elastic::DataMigrationService.migration_has_finished?(:create_epic_index) end diff --git a/ee/app/services/concerns/search/elasticsearchable.rb b/ee/app/services/concerns/search/elasticsearchable.rb index 87e00531e06e0c19cc5941040571ef24e1296d3d..3fd721d9dfe48d03ceec7916339cd3b17e177e84 100644 --- a/ee/app/services/concerns/search/elasticsearchable.rb +++ b/ee/app/services/concerns/search/elasticsearchable.rb @@ -21,7 +21,6 @@ def global_elasticsearchable_scope? def advanced_epic_search? return true unless params[:scope] == 'epics' - return false unless ::Feature.enabled?(:advanced_epic_search, current_user) ::Elastic::DataMigrationService.migration_has_finished?(:create_epic_index) && ::Elastic::DataMigrationService.migration_has_finished?(:backfill_epics) diff --git a/ee/config/feature_flags/development/advanced_epic_search.yml b/ee/config/feature_flags/development/advanced_epic_search.yml deleted file mode 100644 index 058f525d10289520b9901e5bae069f33bc58f9bc..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/development/advanced_epic_search.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: advanced_epic_search -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124072 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415684 -milestone: '16.3' -type: development -group: group::global search -default_enabled: false diff --git a/ee/config/feature_flags/development/elastic_index_epics.yml b/ee/config/feature_flags/development/elastic_index_epics.yml deleted file mode 100644 index 30bef60396df7155673375dfb9bad873965f64e2..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/development/elastic_index_epics.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: elastic_index_epics -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121635 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/412108 -milestone: '16.2' -type: development -group: group::global search -default_enabled: true diff --git a/ee/spec/elastic_integration/epic_index_spec.rb b/ee/spec/elastic_integration/epic_index_spec.rb index 705ffe1e17fccdc2e1b65b39eab2950363933d55..11dbe3c3ed6b44e497cf5fecece744094f63b5f9 100644 --- a/ee/spec/elastic_integration/epic_index_spec.rb +++ b/ee/spec/elastic_integration/epic_index_spec.rb @@ -15,7 +15,6 @@ let(:client) { helper.client } before do - stub_feature_flags(elastic_index_epics: true) allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?) .with(:migrate_wikis_to_separate_index).and_return(false) allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?) diff --git a/ee/spec/models/epic_spec.rb b/ee/spec/models/epic_spec.rb index 9d87d196cc6c8633fae36aaa6dd05e7d8757a453..decde9938efd5e3739452b6e925e443ea47374da 100644 --- a/ee/spec/models/epic_spec.rb +++ b/ee/spec/models/epic_spec.rb @@ -1254,16 +1254,6 @@ def as_item(item) expect(epic).to be_use_elasticsearch end - context 'when feature flag is disabled' do - before do - stub_feature_flags(elastic_index_epics: false) - end - - it 'use_elasticsearch? is false' do - expect(epic).not_to be_use_elasticsearch - end - end - context 'with elasticsearch enabled' do before do allow(Gitlab::CurrentSettings.current_application_settings) diff --git a/ee/spec/services/concerns/search/elasticsearchable_spec.rb b/ee/spec/services/concerns/search/elasticsearchable_spec.rb index 974494f121a1473462facf2d443cb4b9ac72b20d..8e3ef678d453d0233891b79c92d219219385dd85 100644 --- a/ee/spec/services/concerns/search/elasticsearchable_spec.rb +++ b/ee/spec/services/concerns/search/elasticsearchable_spec.rb @@ -81,19 +81,15 @@ def elasticsearchable_scope let(:params) { { scope: 'epics' } } - where(:advanced_epic_search_enabled, :create_epic_index_finished, :backfill_epics_finished, :result) do - true | true | true | true - true | true | false | false - true | false | true | false - true | false | false | false - false | true | true | false - false | false | false | false + where(:create_epic_index_finished, :backfill_epics_finished, :result) do + true | true | true + true | false | false + false | true | false + false | false | false end with_them do it 'returns the correct result' do - stub_feature_flags(advanced_epic_search: advanced_epic_search_enabled) - allow(Elastic::DataMigrationService).to receive(:migration_has_finished?) .with(:create_epic_index).and_return(create_epic_index_finished)