From be3dce70b855f2866e61043bf306cbde447ba97e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Jun 2026 05:22:05 -0400
Subject: [PATCH] Update doorkeeper to version 5.9.1 (#39132)

---
 Gemfile.lock                      | 2 +-
 config/application.rb             | 3 ---
 config/initializers/doorkeeper.rb | 6 ++++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3a744a28c0..57eb2045b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -210,7 +210,7 @@ GEM
       activerecord (>= 7.0, < 9.0)
     docile (1.4.1)
     domain_name (0.6.20240107)
-    doorkeeper (5.9.0)
+    doorkeeper (5.9.1)
       railties (>= 5)
     dotenv (3.2.0)
     drb (2.2.3)
diff --git a/config/application.rb b/config/application.rb
index 09fe38065e..5c5de3e23a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -111,9 +111,6 @@ module Mastodon
     end
 
     config.to_prepare do
-      Doorkeeper::Application.include ApplicationExtension
-      Doorkeeper::AccessGrant.include AccessGrantExtension
-      Doorkeeper::AccessToken.include AccessTokenExtension
       Devise::FailureApp.include AbstractController::Callbacks
       Devise::FailureApp.include Localized
     end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 908acb5503..2fb690032a 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -179,3 +179,9 @@ Doorkeeper.configure do
   # WWW-Authenticate Realm (default "Doorkeeper").
   # realm "Doorkeeper"
 end
+
+Rails.application.reloader.to_prepare do
+  Doorkeeper.config.application_model.include ApplicationExtension
+  Doorkeeper.config.access_grant_model.include AccessGrantExtension
+  Doorkeeper.config.access_token_model.include AccessTokenExtension
+end