aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-08 15:19:23 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-08 15:19:23 -0200
commit7fb809c03359cb4bc80204a557abdb20bbd8dc25 (patch)
tree0a845eba1f9352c411afa212384ee61af5ada466 /activerecord/lib
parentc8284c8025dd63c30bdb9c905ef725a1a13160a8 (diff)
parentffce60e1280a4a1262f66660cd1540f424848157 (diff)
downloadrails-7fb809c03359cb4bc80204a557abdb20bbd8dc25.tar.gz
rails-7fb809c03359cb4bc80204a557abdb20bbd8dc25.tar.bz2
rails-7fb809c03359cb4bc80204a557abdb20bbd8dc25.zip
Merge pull request #17964 from carols10cents/improve-after-commit-argumenterror-message
Make error message clearer that :on requires a symbol, not a string
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/transactions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index f92e1de03b..01e8f69b02 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -265,7 +265,7 @@ module ActiveRecord
def assert_valid_transaction_action(actions)
if (actions - ACTIONS).any?
- raise ArgumentError, ":on conditions for after_commit and after_rollback callbacks have to be one of #{ACTIONS.join(",")}"
+ raise ArgumentError, ":on conditions for after_commit and after_rollback callbacks have to be one of #{ACTIONS}"
end
end
end