aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2013-07-03 21:40:20 +0200
committerArun Agrawal <arunagw@gmail.com>2013-07-03 23:23:11 +0200
commitb23501112e40f8e8fff3676147c8a4aa8d8a4aa3 (patch)
treed32d84fc98e40c87d585d3df8cc65eeb59f06015 /activerecord
parent51c97e7e192e82cc3b563a15bcaac286b4f8e422 (diff)
downloadrails-b23501112e40f8e8fff3676147c8a4aa8d8a4aa3.tar.gz
rails-b23501112e40f8e8fff3676147c8a4aa8d8a4aa3.tar.bz2
rails-b23501112e40f8e8fff3676147c8a4aa8d8a4aa3.zip
Remove deprecated `decrement_open_transactions`.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 878807151b..e13aa74de8 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `decrement_open_transactions`.
+
+ *Arun Agrawal*
+
* Remove deprecated `increment_open_transactions`.
*Arun Agrawal*
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 5ef70487dd..5887e6e0cd 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -387,10 +387,6 @@ module ActiveRecord
@transaction.number
end
- def decrement_open_transactions
- ActiveSupport::Deprecation.warn "#decrement_open_transactions is deprecated and has no effect"
- end
-
def transaction_joinable=(joinable)
message = "#transaction_joinable= is deprecated. Please pass the :joinable option to #begin_transaction instead."
ActiveSupport::Deprecation.warn message