tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update doorkeeper to version 5.9.1 (#39132)

Browse Source
This commit is contained in:
Matt Jankowski 2026-06-05 05:22:05 -04:00 committed by GitHub
parent ff4d97180d
commit be3dce70b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -210,7 +210,7 @@ GEM
activerecord (>= 7.0, < 9.0) activerecord (>= 7.0, < 9.0)
docile (1.4.1) docile (1.4.1)
domain_name (0.6.20240107) domain_name (0.6.20240107)
doorkeeper (5.9.0) doorkeeper (5.9.1)
railties (>= 5) railties (>= 5)
dotenv (3.2.0) dotenv (3.2.0)
drb (2.2.3) drb (2.2.3)

3
config/application.rb
View File

@ -111,9 +111,6 @@ module Mastodon
end end
config.to_prepare do config.to_prepare do
Doorkeeper::Application.include ApplicationExtension
Doorkeeper::AccessGrant.include AccessGrantExtension
Doorkeeper::AccessToken.include AccessTokenExtension
Devise::FailureApp.include AbstractController::Callbacks Devise::FailureApp.include AbstractController::Callbacks
Devise::FailureApp.include Localized Devise::FailureApp.include Localized
end end

6
config/initializers/doorkeeper.rb
View File

@ -179,3 +179,9 @@ Doorkeeper.configure do
# WWW-Authenticate Realm (default "Doorkeeper"). # WWW-Authenticate Realm (default "Doorkeeper").
# realm "Doorkeeper" # realm "Doorkeeper"
end 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