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

app/controllers/api/v1/donation_campaigns_controller.rb

@@ -60,7 +60,7 @@ class Api::V1::DonationCampaignsController < Api::BaseController
         return JSON.parse(res.body_with_limit) if res.code == 200
       end
     end
-  rescue *Mastodon::HTTP_CONNECTION_ERRORS, Oj::ParseError
+  rescue *Mastodon::HTTP_CONNECTION_ERRORS, JSON::ParserError
     nil
   end