diff options
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/rendering.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index 441bdccd84..8382023e06 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -38,7 +38,7 @@ module ActionView initializer "action_view.setup_action_pack", before: :add_view_paths do |app| ActiveSupport.on_load(:action_controller) do - #ActionController::Base.superclass.send(:include, ActionView::Layouts) + ActionController::Base.superclass.send(:include, ActionView::Layouts) end end diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index 0db469766c..e3d0beade3 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -82,8 +82,6 @@ module ActionView super(*args, &block) options = _normalize_render(*args, &block) - - self.content_type ||= Mime[lookup_context.rendered_format].to_s self.response_body = render_to_body(options) end |