diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-03-18 19:54:12 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-03-18 19:54:12 -0700 |
| commit | 2cf38aebacaf78260848a54bfbb5bf5a9b627598 (patch) | |
| tree | 7ce2c747cef424e2f559f2675949c4aa96b6f746 /railties/lib/rails | |
| parent | ef5faeb4a5d0d3a49e4ac7dc378459cdba5a76b7 (diff) | |
| parent | 8aadc6f0f4316d96397ef07876b1c0f9ff7dcf6c (diff) | |
| download | rails-2cf38aebacaf78260848a54bfbb5bf5a9b627598.tar.gz rails-2cf38aebacaf78260848a54bfbb5bf5a9b627598.tar.bz2 rails-2cf38aebacaf78260848a54bfbb5bf5a9b627598.zip | |
Merge pull request #9789 from puma/3-2-stable
Change @env_config to @app_env_config
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 854ac2cbbc..4f695159ea 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -167,7 +167,7 @@ module Rails # These parameters will be used by middlewares and engines to configure themselves. # def env_config - @env_config ||= super.merge({ + @app_env_config ||= super.merge({ "action_dispatch.parameter_filter" => config.filter_parameters, "action_dispatch.secret_token" => config.secret_token, "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions, |