diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-14 00:50:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 00:50:43 +0100 |
| commit | db01f8b942b72eaa2eacbb144261b002f8079c9c (patch) | |
| tree | 2391ed3e8c3cb95c50d7e5fe3d35b36148989cb7 /config | |
| parent | 8ffae82fa61385a33f819e037aa741d0b3e99187 (diff) | |
| parent | de5cc20dd8e15eb7e90d65392a6e6f9145746913 (diff) | |
Merge pull request #1465 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 de2951487..af7735221 100644 --- a/config/application.rb +++ b/config/application.rb @@ -140,6 +140,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 |