Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/search_results.rb')
-rw-r--r--lib/gitlab/search_results.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 35e01101b3b..d06f414bd9a 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -238,9 +238,7 @@ module Gitlab
def filter_milestones_by_project(milestones)
candidate_project_ids = project_ids_relation
- if Feature.enabled?(:search_milestones_hide_archived_projects, current_user) && !filters[:include_archived]
- candidate_project_ids = candidate_project_ids.non_archived
- end
+ candidate_project_ids = candidate_project_ids.non_archived unless filters[:include_archived]
project_ids = milestones.of_projects(candidate_project_ids).select(:project_id).distinct.pluck(:project_id) # rubocop: disable CodeReuse/ActiveRecord