diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 06:09:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 06:09:55 +0300 |
| commit | 4ed4dc08a806773e5dc326fc0c18bda6f6ea7af7 (patch) | |
| tree | 6b68c951a0fa49efd7bab988fd740012cbe5443b /app/helpers/search_helper.rb | |
| parent | 186e045e14c941ac0b8490a0ff92694b186990ad (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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 8fc9f5ca6fd..36b58be60fc 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, :scope, :project_id, :group_id, :repository_ref, :snippets, :state, :confidential].freeze + SEARCH_PERMITTED_PARAMS = [:search, :scope, :project_id, :group_id, :repository_ref, :snippets, :sort, :state, :confidential].freeze def search_autocomplete_opts(term) return unless current_user @@ -305,8 +305,6 @@ module SearchHelper end def show_user_search_tab? - return false if Feature.disabled?(:users_search, default_enabled: true) - if @project project_search_tabs?(:members) else |