diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-26 12:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-26 12:08:48 +0300 |
commit | c60d68bbaca234673f2f689e1f7444ce8edbcf86 (patch) | |
tree | fc071d0fe52e6e8dbfacb284e603882ea03d99f0 /app/helpers/search_helper.rb | |
parent | f1cbf932ab54aea7a79a1ea0b09ba3e8caeb33a9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/search_helper.rb')
-rw-r--r-- | app/helpers/search_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index ae7882c0013..704a1471b87 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module SearchHelper - SEARCH_PERMITTED_PARAMS = [ + SEARCH_GENERIC_PARAMS = [ :search, :scope, :project_id, @@ -9,8 +9,6 @@ module SearchHelper :repository_ref, :snippets, :sort, - :state, - :confidential, :force_search_results ].freeze @@ -255,7 +253,7 @@ module SearchHelper search_params = params .merge(search) .merge({ scope: scope }) - .permit(SEARCH_PERMITTED_PARAMS) + .permit(SEARCH_GENERIC_PARAMS) if @scope == scope li_class = 'active' |