aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorSamantha John <sam@gethopscotch.com>2019-03-06 16:35:52 -0500
committerSamantha John <sam@gethopscotch.com>2019-03-06 16:35:52 -0500
commit755112c7b15ad5a8a8621ac307a55b6bbf487c7b (patch)
tree0066a1b2862ccc596f8bf256582a12e6c0da0f85 /activerecord/lib/active_record/relation
parent134eaca7e2f32651eb5bbbcbea8fb990bff22b08 (diff)
downloadrails-755112c7b15ad5a8a8621ac307a55b6bbf487c7b.tar.gz
rails-755112c7b15ad5a8a8621ac307a55b6bbf487c7b.tar.bz2
rails-755112c7b15ad5a8a8621ac307a55b6bbf487c7b.zip
Replace “can not” with “cannot”.
Diffstat (limited to 'activerecord/lib/active_record/relation')
-rw-r--r--activerecord/lib/active_record/relation/finder_methods.rb2
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 74f323a278..e2efd4aa0d 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -7,7 +7,7 @@ module ActiveRecord
ONE_AS_ONE = "1 AS one"
# Find by id - This can either be a specific id (1), a list of ids (1, 5, 6), or an array of ids ([5, 6, 10]).
- # If one or more records can not be found for the requested ids, then ActiveRecord::RecordNotFound will be raised.
+ # If one or more records cannot be found for the requested ids, then ActiveRecord::RecordNotFound will be raised.
# If the primary key is an integer, find by id coerces its arguments by using +to_i+.
#
# Person.find(1) # returns the object for ID = 1
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 24a50db619..9425332321 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1117,7 +1117,7 @@ module ActiveRecord
o.reverse
when String
if does_not_support_reverse?(o)
- raise IrreversibleOrderError, "Order #{o.inspect} can not be reversed automatically"
+ raise IrreversibleOrderError, "Order #{o.inspect} cannot be reversed automatically"
end
o.split(",").map! do |s|
s.strip!