diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-09-08 13:47:31 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-09-08 13:47:31 +0200 |
commit | 3e617bbf45655f251fb9fb89beebccdb0f3ced82 (patch) | |
tree | 070608c9b89ad59a1882675a79f571a0a9d8f729 /activerecord | |
parent | 8a639ffca6b89b84a14bcce6a178a2e6daa9f944 (diff) | |
parent | dad0c2677cb94c286c67af5e6a32f7956e02aafe (diff) | |
download | rails-3e617bbf45655f251fb9fb89beebccdb0f3ced82.tar.gz rails-3e617bbf45655f251fb9fb89beebccdb0f3ced82.tar.bz2 rails-3e617bbf45655f251fb9fb89beebccdb0f3ced82.zip |
Merge pull request #21530 from arvindmehra/am-ar-to-activerecord
Replace AR with ActiveRecord to make it more readable [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/inheritance.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/model_schema.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb index e613d157aa..c26842014d 100644 --- a/activerecord/lib/active_record/inheritance.rb +++ b/activerecord/lib/active_record/inheritance.rb @@ -82,7 +82,7 @@ module ActiveRecord # Returns the class descending directly from ActiveRecord::Base, or # an abstract class, if any, in the inheritance hierarchy. # - # If A extends AR::Base, A.base_class will return A. If B descends from A + # If A extends ActiveRecord::Base, A.base_class will return A. If B descends from A # through some arbitrarily deep hierarchy, B.base_class will return A. # # If B < A and C < B and if A is an abstract_class then both B.base_class diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb index 5a6f42ba09..2b0c755ef4 100644 --- a/activerecord/lib/active_record/model_schema.rb +++ b/activerecord/lib/active_record/model_schema.rb @@ -240,7 +240,7 @@ module ActiveRecord end # Returns a hash where the keys are column names and the values are - # default values when instantiating the AR object for this table. + # default values when instantiating the Active Record object for this table. def column_defaults load_schema _default_attributes.to_hash |