Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-12-21 19:42:13 +01:00
parent 30ee7339d3 b7bdcd4f39
commit 92aa6e2ec9
25 changed files with 2979 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/v2/search_controller.rb
View File

@@ -12,6 +12,7 @@ class Api::V2::SearchController < Api::BaseController
before_action :query_pagination_error, if: :pagination_requested?
before_action :remote_resolve_error, if: :remote_resolve_requested?
end
before_action :require_valid_pagination_options!
def index
@search = Search.new(search_results)