aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-05-30 13:43:44 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-05-30 13:43:44 -0700
commitc71488b62e7834b0fd5989947b4d69260e23d8a4 (patch)
treeeef91a7ed921c5aa9f6f6056206be424db76e9ff /activerecord
parent47f4d8d513ed5bb4516cd1175889fcabfb361263 (diff)
parent1489e4f20841b46ebca1ca065c60fb0f2e553e46 (diff)
downloadrails-c71488b62e7834b0fd5989947b4d69260e23d8a4.tar.gz
rails-c71488b62e7834b0fd5989947b4d69260e23d8a4.tar.bz2
rails-c71488b62e7834b0fd5989947b4d69260e23d8a4.zip
Merge pull request #10805 from pilaf/master
Fix word order in documentation for with_lock [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/locking/pessimistic.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/pessimistic.rb b/activerecord/lib/active_record/locking/pessimistic.rb
index 8e4ddcac82..ddf2afca0c 100644
--- a/activerecord/lib/active_record/locking/pessimistic.rb
+++ b/activerecord/lib/active_record/locking/pessimistic.rb
@@ -64,7 +64,7 @@ module ActiveRecord
end
# Wraps the passed block in a transaction, locking the object
- # before yielding. You pass can the SQL locking clause
+ # before yielding. You can pass the SQL locking clause
# as argument (see <tt>lock!</tt>).
def with_lock(lock = true)
transaction do