diff options
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/observer.rb | 2 | ||||
| -rw-r--r-- | activesupport/CHANGELOG | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 1aab9e23df..44aedddc5e 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -123,7 +123,7 @@ module ActionMailer # Action Mailer subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::OnlySubclasses + include Reloadable::Subclasses private_class_method :new #:nodoc: diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0b4a8ca3c5..a3f6a0326f 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -225,7 +225,7 @@ module ActionController #:nodoc: class Base DEFAULT_RENDER_STATUS_CODE = "200 OK" - include Reloadable::OnlySubclasses + include Reloadable::Subclasses # Determines whether the view has access to controller internals @request, @response, @session, and @template. # By default, it does. diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb index ae0d7560e2..51829c6651 100644 --- a/activerecord/lib/active_record/observer.rb +++ b/activerecord/lib/active_record/observer.rb @@ -83,7 +83,7 @@ module ActiveRecord # Observer subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::OnlySubclasses + include Reloadable::Subclasses # Attaches the observer to the supplied model classes. def self.observe(*models) diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 6120f877e5..4b6c3096d3 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -6,9 +6,9 @@ * Remove LoadingModule. [Nicholas Seckar] -* Add documentation for Reloadable::OnlySubclasses. [Nicholas Seckar] +* Add documentation for Reloadable::Subclasses. [Nicholas Seckar] -* Add Reloadable::OnlySubclasses which handles the common case where a base class should not be reloaded, but its subclasses should be. [Nicholas Seckar] +* Add Reloadable::Subclasses which handles the common case where a base class should not be reloaded, but its subclasses should be. [Nicholas Seckar] * Further improvements to reloading code [Nicholas Seckar, Trevor Squires] |