Remove doorkeeper workaround (#39336)
This commit is contained in:
1 parent
481e51b81e
commit
0b0cdd7a77
2 files changed
+3
-6
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
Reference in new issue
Block a user