diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:40:46 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:40:46 -0600 |
| commit | b423ac926497367b418c31f65fec69bb3a193170 (patch) | |
| tree | 1ba44da45b7f15cc8dbd888b0ed7e92373ec5a54 /config | |
| parent | 34b02a74b4a68f62e2a7c0cbee06edfe2aa92edd (diff) | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index bc372851c..1fb79a4aa 100644 --- a/config/application.rb +++ b/config/application.rb @@ -142,6 +142,7 @@ module Mastodon Doorkeeper::AuthorizationsController.layout 'modal' Doorkeeper::AuthorizedApplicationsController.layout 'admin' Doorkeeper::Application.send :include, ApplicationExtension + Doorkeeper::AccessToken.send :include, AccessTokenExtension Devise::FailureApp.send :include, AbstractController::Callbacks Devise::FailureApp.send :include, HttpAcceptLanguage::EasyAccess Devise::FailureApp.send :include, Localized |