aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2013-07-03 20:48:49 +0200
committerArun Agrawal <arunagw@gmail.com>2013-07-03 23:23:11 +0200
commit51c97e7e192e82cc3b563a15bcaac286b4f8e422 (patch)
treeac334cbc9eac43389fb691f79408d31476c010b9 /activerecord
parentb785e921d186753d905c1d0415b91d0987958028 (diff)
downloadrails-51c97e7e192e82cc3b563a15bcaac286b4f8e422.tar.gz
rails-51c97e7e192e82cc3b563a15bcaac286b4f8e422.tar.bz2
rails-51c97e7e192e82cc3b563a15bcaac286b4f8e422.zip
removed deprecated increment_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 9cd011aef5..878807151b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `increment_open_transactions`.
+
+ *Arun Agrawal*
+
* Remove deprecated `PostgreSQLAdapter#outside_transaction?`
method. You can use `#transaction_open?` instead.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index e232cad982..5ef70487dd 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 increment_open_transactions
- ActiveSupport::Deprecation.warn "#increment_open_transactions is deprecated and has no effect"
- end
-
def decrement_open_transactions
ActiveSupport::Deprecation.warn "#decrement_open_transactions is deprecated and has no effect"
end