Merge remote-tracking branch 'parent/main' into upstream-20231221

2023-12-21 08:37:12 +09:00 · 2023-12-21 08:37:12 +09:00 · a6b57e3890
commit a6b57e3890
parent 7b8fedb3cd d29b1cca2e
154 changed files with 7762 additions and 1748 deletions
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@ -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)