diff options
| author | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
| commit | 383bb3804bdbd6caa442283cc96ef0cdbfdb4575 (patch) | |
| tree | 54ecc09c325567ab1cfc4af9ba13ad134d9c3c72 /config/application.rb | |
| parent | 259470ec37dfc5c3d34ed5456adcd3ab1a622a18 (diff) | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 68a1917b7..c85d4af06 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,6 +22,8 @@ require_relative '../lib/mastodon/version' require_relative '../lib/devise/two_factor_ldap_authenticatable' require_relative '../lib/devise/two_factor_pam_authenticatable' require_relative '../lib/chewy/strategy/custom_sidekiq' +require_relative '../lib/webpacker/manifest_extensions' +require_relative '../lib/webpacker/helper_extensions' Dotenv::Railtie.load @@ -84,6 +86,7 @@ module Mastodon :kk, :kn, :ko, + :ku, :lt, :lv, :mk, @@ -99,6 +102,8 @@ module Mastodon :'pt-PT', :ro, :ru, + :sa, + :sc, :sk, :sl, :sq, @@ -112,6 +117,7 @@ module Mastodon :uk, :ur, :vi, + :zgh, :'zh-CN', :'zh-HK', :'zh-TW', @@ -138,6 +144,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 |