diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index bdecc37063..6bfe0a361f 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -11,7 +11,7 @@ module AbstractController end module Rendering - extend ActiveSupport::Concern + extend ActiveSupport::Concern included do class_attribute :protected_instance_variables diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b785d52832..80b5f118ff 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -4,7 +4,7 @@ require "action_controller/metal/params_wrapper" module ActionController # The <tt>metal</tt> anonymous class is simple workaround the ordering issues there are with modules. - # They need to be included in specyfic order which makes it impossible for 3rd party libs (like ActiveRecord) + # They need to be included in specific order which makes it impossible for 3rd party libs (like ActiveRecord) # to hook up with its own functionality. Having anonymous super class type of Metal with <tt>AbstractController::Rendering</tt> # included, allows us to include <tt>ActionView::Rendering</tt> (which implements <tt>AbstractController::Rendering</tt> interface) # after the <tt>AbstractController::Rendering</tt> and before <tt>ActionController::Rendering</tt>. |