Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2024-10-14 19:46:52 +02:00
commit 4d9b4ef72f
81 files changed
+738 -533

No files matched your search

+1 -1
View File
@@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base
rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity
rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests
rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error
rescue_from(*Mastodon::HTTP_CONNECTION_ERRORS, with: :internal_server_error)
rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight, ActiveRecord::SerializationFailure, with: :service_unavailable
rescue_from Seahorse::Client::NetworkingError do |e|