aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-02 10:51:17 +0200
committerGitHub <noreply@github.com>2017-07-02 10:51:17 +0200
commitafee464b6dc45033bad81b3677016fb45daea92d (patch)
tree22d880bbf68092386852a3f8a672e6b19fbe8eb6
parentb3f8cde0f28d929263296ad7e5bd929b8c5a600e (diff)
parent27996bc1fb3ad2115a3e091240c6eec79898fd8c (diff)
downloadrails-afee464b6dc45033bad81b3677016fb45daea92d.tar.gz
rails-afee464b6dc45033bad81b3677016fb45daea92d.tar.bz2
rails-afee464b6dc45033bad81b3677016fb45daea92d.zip
Merge pull request #29654 from kamipo/fix_deprecation_message
Fix removed version 5.2 to 6.0 in the deprecation message
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/transaction.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index 2393e35ecd..f63d09039f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -33,7 +33,7 @@ module ActiveRecord
def set_state(state)
ActiveSupport::Deprecation.warn(<<-MSG.squish)
The set_state method is deprecated and will be removed in
- Rails 5.2. Please use rollback! or commit! to set transaction
+ Rails 6.0. Please use rollback! or commit! to set transaction
state directly.
MSG
case state