diff options
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index a6889d5d01..48725ad82a 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -86,6 +86,11 @@ module AbstractController abstract! + # Initialize controller with nil formats. + def initialize #:nodoc: + @_formats = nil + end + # Calls the action going through the entire action dispatch stack. # # The actual method that is called is determined by calling diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 332d86b089..d57136dbb8 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -17,12 +17,6 @@ module AbstractController self._view_paths ||= ActionView::PathSet.new end - # Initialize controller with nil formats. - def initialize(*) #:nodoc: - @_formats = nil - super - end - # An instance of a view class. The default view class is ActionView::Base # # The view class must have the following methods: |