diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-02-12 10:28:32 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-02-12 10:28:32 +0100 |
| commit | 5e11f3a6e1de864da8a7e694f18eaa3b5e4c7379 (patch) | |
| tree | f0dc221cad560933a921fc2b4d85fad065a7601a /config/application.rb | |
| parent | a30a40c4379b26890b6453083ef213e672658902 (diff) | |
| parent | 15ced8728ff89932e3f8febf119f63c78ac9a960 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied 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 696dc17e6..116eaf29d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -25,6 +25,8 @@ 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' +require_relative '../lib/action_dispatch/cookie_jar_extensions' +require_relative '../lib/rails/engine_extensions' Dotenv::Railtie.load |