Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-13 00:16:41 -05:00
Code Issues Actions 3 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
2 changed files with 3 additions and 6 deletions
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
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

6
config/initializers/doorkeeper.rb
View File

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