diff options
author | Xavier Noria <fxn@hashref.com> | 2011-02-18 23:22:15 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-02-18 23:22:15 +0100 |
commit | f41bf6938fd4aa5a83777cc767f7f32ace5f6539 (patch) | |
tree | eb85baf61ec970ca090ed057536c2d0ee1b18e5b /activemodel/lib/active_model | |
parent | fbfa30a1eeaaab22ac8f43a4137ec8282920fe15 (diff) | |
parent | 220cb107b672d65fdc0488d4ff310ab04b62b463 (diff) | |
download | rails-f41bf6938fd4aa5a83777cc767f7f32ace5f6539.tar.gz rails-f41bf6938fd4aa5a83777cc767f7f32ace5f6539.tar.bz2 rails-f41bf6938fd4aa5a83777cc767f7f32ace5f6539.zip |
merges docrails
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r-- | activemodel/lib/active_model/naming.rb | 2 | ||||
-rw-r--r-- | activemodel/lib/active_model/observing.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb index 44aedc8efd..3f430f94a6 100644 --- a/activemodel/lib/active_model/naming.rb +++ b/activemodel/lib/active_model/naming.rb @@ -69,7 +69,7 @@ module ActiveModel # # Providing the functionality that ActiveModel::Naming provides in your object # is required to pass the Active Model Lint test. So either extending the provided - # method below, or rolling your own is required.. + # method below, or rolling your own is required. module Naming # Returns an ActiveModel::Name object for module. It can be # used to retrieve all kinds of naming-related information. diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb index bf4fd0740c..dde3a882cf 100644 --- a/activemodel/lib/active_model/observing.rb +++ b/activemodel/lib/active_model/observing.rb @@ -156,6 +156,10 @@ module ActiveModel # The AuditObserver will now act on both updates to Account and Balance by treating # them both as records. # + # If you're using an Observer in a Rails application with Active Record, be sure to + # read about the necessary configuration in the documentation for + # ActiveRecord::Observer. + # class Observer include Singleton |