diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-11 14:31:08 -0700 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-11 14:31:08 -0700 |
commit | 1a5fdf77122e32fc710148ea3e795fedb597ad46 (patch) | |
tree | 66494467e90c156a9e24849f18708b44152e3272 /activerecord/lib/active_record/relation | |
parent | dbb2c2c7b5255eee75868835b0ebd2c36f6ff0cd (diff) | |
parent | ac027338e4a165273607dccee49a3d38bc836794 (diff) | |
download | rails-1a5fdf77122e32fc710148ea3e795fedb597ad46.tar.gz rails-1a5fdf77122e32fc710148ea3e795fedb597ad46.tar.bz2 rails-1a5fdf77122e32fc710148ea3e795fedb597ad46.zip |
Merge pull request #24492 from vipulnsward/pass-over-warnings
Clean up all Rails 5 warnings. Revert auto-added periods.
Diffstat (limited to 'activerecord/lib/active_record/relation')
-rw-r--r-- | activerecord/lib/active_record/relation/batches.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb index b99807adf3..3639625722 100644 --- a/activerecord/lib/active_record/relation/batches.rb +++ b/activerecord/lib/active_record/relation/batches.rb @@ -2,7 +2,7 @@ require "active_record/relation/batches/batch_enumerator" module ActiveRecord module Batches - ORDER_OR_LIMIT_IGNORED_MESSAGE = "Scoped order and limit are ignored, it's forced to be batch order and batch size" + ORDER_OR_LIMIT_IGNORED_MESSAGE = "Scoped order and limit are ignored, it's forced to be batch order and batch size." # Looping through a collection of records from the database # (using the Scoping::Named::ClassMethods.all method, for example) diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index 27dd0b4143..e7e331f88d 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -312,7 +312,7 @@ module ActiveRecord conditions = conditions.id ActiveSupport::Deprecation.warn(<<-MSG.squish) You are passing an instance of ActiveRecord::Base to `exists?`. - Please pass the id of the object by calling `.id` + Please pass the id of the object by calling `.id`. MSG end @@ -467,7 +467,7 @@ module ActiveRecord id = id.id ActiveSupport::Deprecation.warn(<<-MSG.squish) You are passing an instance of ActiveRecord::Base to `find`. - Please pass the id of the object by calling `.id` + Please pass the id of the object by calling `.id`. MSG end |