diff options
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/application.rb | 4 | ||||
-rw-r--r-- | railties/lib/rails/engine.rb | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index fee99faf43..4ea828c549 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -125,10 +125,10 @@ module Rails end def env_defaults - @env_defaults ||= { + @env_defaults ||= super.merge({ "action_dispatch.parameter_filter" => config.filter_parameters, "action_dispatch.secret_token" => config.secret_token - } + }) end def initializers diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 41b0a764e2..22a1a15bf5 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -159,7 +159,13 @@ module Rails end def call(env) - app.call(env) + app.call(env.reverse_merge!(env_defaults)) + end + + def env_defaults + @env_defaults ||= { + "action_dispatch.routes" => routes + } end def routes |