diff options
Diffstat (limited to 'lib/gitlab/search_results.rb')
| -rw-r--r-- | lib/gitlab/search_results.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index d06f414bd9a..fada3b84401 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -191,9 +191,7 @@ module Gitlab unless default_project_filter project_ids = project_ids_relation - if Feature.enabled?(:search_issues_hide_archived_projects, current_user) && !filters[:include_archived] - project_ids = project_ids.non_archived - end + project_ids = project_ids.non_archived unless filters[:include_archived] issues = issues.in_projects(project_ids) .allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/420046') @@ -218,9 +216,7 @@ module Gitlab unless default_project_filter project_ids = project_ids_relation - if Feature.enabled?(:search_merge_requests_hide_archived_projects, current_user) && !filters[:include_archived] - project_ids = project_ids.non_archived - end + project_ids = project_ids.non_archived unless filters[:include_archived] merge_requests = merge_requests.of_projects(project_ids) end |