diff options
Diffstat (limited to 'lib/api/search.rb')
| -rw-r--r-- | lib/api/search.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/api/search.rb b/lib/api/search.rb index b9c6a823f4f..85f0a8e2e60 100644 --- a/lib/api/search.rb +++ b/lib/api/search.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module API - class Search < Grape::API::Instance + class Search < ::API::Base include PaginationParams before { authenticate! } @@ -33,6 +33,7 @@ module API scope: params[:scope], search: params[:search], state: params[:state], + confidential: params[:confidential], snippets: snippets?, page: params[:page], per_page: params[:per_page] @@ -62,12 +63,6 @@ module API # Defining this method here as a noop allows us to easily extend it in # EE, without having to modify this file directly. end - - def check_users_search_allowed! - if params[:scope].to_sym == :users && Feature.disabled?(:users_search, default_enabled: true) - render_api_error!({ error: _("Scope not supported with disabled 'users_search' feature!") }, 400) - end - end end resource :search do @@ -81,11 +76,11 @@ module API desc: 'The scope of the search', values: Helpers::SearchHelpers.global_search_scopes optional :state, type: String, desc: 'Filter results by state', values: Helpers::SearchHelpers.search_states + optional :confidential, type: Boolean, desc: 'Filter results by confidentiality' use :pagination end get do verify_search_scope!(resource: nil) - check_users_search_allowed! present search, with: entity end @@ -103,11 +98,11 @@ module API desc: 'The scope of the search', values: Helpers::SearchHelpers.group_search_scopes optional :state, type: String, desc: 'Filter results by state', values: Helpers::SearchHelpers.search_states + optional :confidential, type: Boolean, desc: 'Filter results by confidentiality' use :pagination end get ':id/(-/)search' do verify_search_scope!(resource: user_group) - check_users_search_allowed! present search(group_id: user_group.id), with: entity end @@ -126,11 +121,10 @@ module API values: Helpers::SearchHelpers.project_search_scopes optional :ref, type: String, desc: 'The name of a repository branch or tag. If not given, the default branch is used' optional :state, type: String, desc: 'Filter results by state', values: Helpers::SearchHelpers.search_states + optional :confidential, type: Boolean, desc: 'Filter results by confidentiality' use :pagination end get ':id/(-/)search' do - check_users_search_allowed! - present search({ project_id: user_project.id, repository_ref: params[:ref] }), with: entity end end |