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

2025-12-14 00:08:46 +00:00 · 2025-08-05 15:46:33 +02:00
parent 98685f744d ffeb5da991
commit 3f166bb068
68 changed files with 192 additions and 24 deletions
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -20,7 +20,7 @@ class Api::V2::SearchController < Api::BaseController
    @search = Search.new(search_results)
    render json: @search, serializer: REST::SearchSerializer
  rescue Mastodon::SyntaxError
-    unprocessable_entity
+    unprocessable_content
  rescue ActiveRecord::RecordNotFound
    not_found
  end