diff options
author | Sean Griffin <sean@thoughtbot.com> | 2014-08-14 19:48:14 -0600 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-08-14 19:48:14 -0600 |
commit | f84f7ebe54c61b1c068bffc2e2463aa4afe7bdb4 (patch) | |
tree | 07b3028c34104cc4737b1330ba0def7c4e7e57d9 /activerecord/lib/active_record | |
parent | 4751a8c51ff4b9766dcf8324347477095b7f940d (diff) | |
parent | 20f32bbc3b93ef220ad75303a403fb221a5a2fea (diff) | |
download | rails-f84f7ebe54c61b1c068bffc2e2463aa4afe7bdb4.tar.gz rails-f84f7ebe54c61b1c068bffc2e2463aa4afe7bdb4.tar.bz2 rails-f84f7ebe54c61b1c068bffc2e2463aa4afe7bdb4.zip |
Merge pull request #16508 from jbsmith86/master
Spelling errors
Diffstat (limited to 'activerecord/lib/active_record')
3 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 1fed7f74e7..d57da366bd 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -63,7 +63,7 @@ module ActiveRecord should_reset = (through_scope != through_reflection.klass.unscoped) || (reflection.options[:source_type] && through_reflection.collection?) - # Dont cache the association - we would only be caching a subset + # Don't cache the association - we would only be caching a subset if should_reset owners.each { |owner| owner.association(association_name).reset diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index a2bb78dfcc..09e2faee86 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -279,9 +279,9 @@ module ActiveRecord end # Returns an <tt>#inspect</tt>-like string for the value of the - # attribute +attr_name+. String attributes are truncated upto 50 + # attribute +attr_name+. String attributes are truncated up to 50 # characters, Date and Time attributes are returned in the - # <tt>:db</tt> format, Array attributes are truncated upto 10 values. + # <tt>:db</tt> format, Array attributes are truncated up to 10 values. # Other attributes return the value of <tt>#inspect</tt> without # modification. # diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb index 34ed32ad35..380c50fc14 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb @@ -12,7 +12,7 @@ module ActiveRecord # roundtripping jsonb columns. This causes some false positives for # the comparison here. Therefore, we need to parse and re-dump the # raw value here to ensure the insignificant whitespaces are - # consitent with our encoder's output. + # consistent with our encoder's output. raw_old_value = type_cast_for_database(type_cast_from_database(raw_old_value)) super(raw_old_value, new_value) end |