aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 4ffde6198a..7e1359c42b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,7 +1,7 @@
require "active_support/core_ext/kernel/reporting"
require "active_support/file_update_checker"
-require "rails/engine/configuration"
-require "rails/source_annotation_extractor"
+require_relative "../engine/configuration"
+require_relative "../source_annotation_extractor"
module Rails
class Application
@@ -92,6 +92,10 @@ module Rails
action_dispatch.use_authenticated_cookie_encryption = true
end
+ if respond_to?(:active_support)
+ active_support.use_authenticated_message_encryption = true
+ end
+
else
raise "Unknown version #{target_version.to_s.inspect}"
end