aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/locking_test.rb
diff options
context:
space:
mode:
authorBen Woosley <ben.woosley@gmail.com>2013-07-20 20:15:48 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-24 13:20:30 -0300
commitb4dea61a428e28da1f27630c01b2ee40bd6294b3 (patch)
treeabde35673b20ee102828a046acd20e4cb03ce992 /activerecord/test/cases/locking_test.rb
parent33e1604b3e9d7c99f9e3b0988248acc46e626f34 (diff)
downloadrails-b4dea61a428e28da1f27630c01b2ee40bd6294b3.tar.gz
rails-b4dea61a428e28da1f27630c01b2ee40bd6294b3.tar.bz2
rails-b4dea61a428e28da1f27630c01b2ee40bd6294b3.zip
Tidy up the "Specified column type for quote_value" changes
This includes fixing typos in changelog, removing a deprecated mocha/setup test require, and preferring the `column_for_attribute` accessor over direct access to the columns_hash in the new code. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/locking/optimistic.rb
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
-rw-r--r--activerecord/test/cases/locking_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index bd57943eac..d15f1fb8fb 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -1,5 +1,4 @@
require 'thread'
-require 'mocha/setup'
require "cases/helper"
require 'models/person'
require 'models/job'