diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-04-21 10:58:20 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-04-21 10:58:20 -0300 |
| commit | 81f4a7dce42e4a81f02c4b2d060d92b718b03d5a (patch) | |
| tree | 015913ae72dd480d4641a48aafe0f080106d6953 /actionpack/lib/action_controller | |
| parent | 875c679a3397a1c41d70b66f5e353926dbd652a5 (diff) | |
| parent | 7bd2f9177342c57a81880425ab134945aea6fbd9 (diff) | |
| download | rails-81f4a7dce42e4a81f02c4b2d060d92b718b03d5a.tar.gz rails-81f4a7dce42e4a81f02c4b2d060d92b718b03d5a.tar.bz2 rails-81f4a7dce42e4a81f02c4b2d060d92b718b03d5a.zip | |
Merge pull request #24661 from maclover7/fix-22975
Fix ApplicationController.renderer.defaults.merge!
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index e4d19e9dba..2775a24e56 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -45,7 +45,7 @@ module ActionController }.freeze # Create a new renderer instance for a specific controller class. - def self.for(controller, env = {}, defaults = DEFAULTS) + def self.for(controller, env = {}, defaults = DEFAULTS.dup) new(controller, env, defaults) end |