aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-12-29 16:08:12 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-12-29 17:53:04 -0500
commit8029f779b8a1dd9848fee0b7967c2e0849bf6e07 (patch)
tree33a6f12b9c826a3ba63bb3c81f9f95f17e87f59b
parent419e06b56c3b0229f0c72d3e4cdf59d34d8e5545 (diff)
downloadrails-8029f779b8a1dd9848fee0b7967c2e0849bf6e07.tar.gz
rails-8029f779b8a1dd9848fee0b7967c2e0849bf6e07.tar.bz2
rails-8029f779b8a1dd9848fee0b7967c2e0849bf6e07.zip
Remove deprecated `#raise_in_transactional_callbacks` configuration
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/transactions.rb10
2 files changed, 4 insertions, 10 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e940f95f9e..15dfc3854f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `#raise_in_transactional_callbacks` configuration.
+
+ *Rafael Mendonça França*
+
* Remove deprecated `#load_schema_for`.
*Rafael Mendonça França*
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index f22acd0f77..56b75540e3 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -274,16 +274,6 @@ module ActiveRecord
set_callback(:rollback_without_transaction_enrollment, :after, *args, &block)
end
- def raise_in_transactional_callbacks
- ActiveSupport::Deprecation.warn("ActiveRecord::Base.raise_in_transactional_callbacks is deprecated and will be removed without replacement.")
- true
- end
-
- def raise_in_transactional_callbacks=(value)
- ActiveSupport::Deprecation.warn("ActiveRecord::Base.raise_in_transactional_callbacks= is deprecated, has no effect and will be removed without replacement.")
- value
- end
-
private
def set_options_for_callbacks!(args, enforced_options = {})