diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-26 15:21:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-26 15:21:36 +0100 |
commit | e7f20cc43ff21afa229da40ee4e5755495948772 (patch) | |
tree | 4b39ece2b4ed3ecb6b4aa876a6fdf304a0cb9e1e /app/controllers/api/v2 | |
parent | ea58e31822d07ca2286f971bf6b0275954dd2726 (diff) |
Add type, limit, offset, min_id, max_id, account_id to search API (#10091)
* Add type, limit, offset, min_id, max_id, account_id to search API Fix #8939 * Make the offset work on accounts and hashtags search as well * Assure brakeman we are not doing mass assignment here * Do not allow paginating unless a type is chosen * Fix search query and index id field on statuses instead of created_at
Diffstat (limited to 'app/controllers/api/v2')
-rw-r--r-- | app/controllers/api/v2/search_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb index 2e91d68ee..9aa6edc69 100644 --- a/app/controllers/api/v2/search_controller.rb +++ b/app/controllers/api/v2/search_controller.rb @@ -2,7 +2,7 @@ class Api::V2::SearchController < Api::V1::SearchController def index - @search = Search.new(search) + @search = Search.new(search_results) render json: @search, serializer: REST::V2::SearchSerializer end end |