about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-02-12 14:02:24 +0100
committerGitHub <noreply@github.com>2021-02-12 14:02:24 +0100
commit8792128f38e19b0d7882468a4f1f9362b98793a0 (patch)
tree2689e394f9f88d05533e70ad0f6bcf622ee2fd5c /config
parenta30a40c4379b26890b6453083ef213e672658902 (diff)
parent49eef466b8274ca5768deca3309af31bfbf81184 (diff)
Merge pull request #1500 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
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