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

Remove doorkeeper workaround (#39336)

Browse Source
This commit is contained in:
Claire 2026-06-09 10:30:48 +02:00 committed by GitHub
parent 481e51b81e
commit 0b0cdd7a77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/application.rb
View File

@ -111,6 +111,9 @@ 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,9 +179,3 @@ 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