Merge branch 'main' of https://github.com/mastodon/mastodon into features/main

2023-12-29 09:55:54 +00:00
parent 6bd375adab 1cba91d6d1
commit d342d103ba
730 changed files with 16117 additions and 6012 deletions
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -33,7 +33,7 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
  end

  def require_not_suspended!
-    forbidden if current_account.suspended?
+    forbidden if current_account.unavailable?
  end

  def set_cache_headers