diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-07 21:47:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 21:47:31 +0100 |
| commit | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (patch) | |
| tree | 6ba298899b376d0c8862d77c1e34339a08dc3121 /config/application.rb | |
| parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
| parent | e4d62042bdb3b0d675c2367b4c48a2a48647af5e (diff) | |
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index ad6cf82d7..bf467d6c3 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 |