diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
| commit | 02fc6fbccdd3345e95592cc14e7855e2f1ea14b3 (patch) | |
| tree | b26b91e2b2fad62ec382c9cee4ca2ac318f09257 /activesupport/lib/active_support/dependencies.rb | |
| parent | 2ba06b48defaca940e7c878724e2fb1c090eaa92 (diff) | |
| parent | 0cbfd6c28d327304432f7d0c067662b5c1e41a78 (diff) | |
| download | rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.gz rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.bz2 rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/persistence.rb
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 787437c49a..dab6fdbac6 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -331,7 +331,7 @@ module ActiveSupport #:nodoc: if load? log "loading #{file_name}" - # Enable warnings iff this file has not been loaded before and + # Enable warnings if this file has not been loaded before and # warnings_on_first_load is set. load_args = ["#{file_name}.rb"] load_args << const_path unless const_path.nil? |