diff options
| -rw-r--r-- | actionview/lib/action_view/base.rb | 4 | ||||
| -rw-r--r-- | actionview/test/fixtures/test/_first_layer.html.erb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index fef4b4bbb0..712e5d251e 100644 --- a/actionview/lib/action_view/base.rb +++ b/actionview/lib/action_view/base.rb @@ -239,9 +239,7 @@ module ActionView #:nodoc: def initialize(lookup_context = nil, assigns = {}, controller = nil, formats = NULL) #:nodoc: @_config = ActiveSupport::InheritableOptions.new - if formats == NULL - formats = nil - else + unless formats == NULL ActiveSupport::Deprecation.warn <<~eowarn Passing formats to ActionView::Base.new is deprecated eowarn diff --git a/actionview/test/fixtures/test/_first_layer.html.erb b/actionview/test/fixtures/test/_first_layer.html.erb index 9f60d20e24..c1f1acb410 100644 --- a/actionview/test/fixtures/test/_first_layer.html.erb +++ b/actionview/test/fixtures/test/_first_layer.html.erb @@ -2,5 +2,3 @@ [ <%= render(partial: "first").chomp.html_safe %>, ]} - - |