diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-28 15:23:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 15:23:46 -0500 |
| commit | 6a7bd6e2e4a4f408781fdfbbfb9508b5a872e9f6 (patch) | |
| tree | a464a455e4f404df206e386e2014fee52f110a3b /activerecord/lib | |
| parent | a00abc150b35659165c12d135b373278e1b313a8 (diff) | |
| parent | c478c74c183c480398eab822f4265e06a9501d36 (diff) | |
| download | rails-6a7bd6e2e4a4f408781fdfbbfb9508b5a872e9f6.tar.gz rails-6a7bd6e2e4a4f408781fdfbbfb9508b5a872e9f6.tar.bz2 rails-6a7bd6e2e4a4f408781fdfbbfb9508b5a872e9f6.zip | |
Merge pull request #28063 from Erol/prioritize-callback-on-action-before-if
Do not evaluate :if arguments when :on is not satisfied for transaction callbacks
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 08417aaa0f..690deee508 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -283,7 +283,7 @@ module ActiveRecord fire_on = Array(options[:on]) assert_valid_transaction_action(fire_on) options[:if] = Array(options[:if]) - options[:if] << "transaction_include_any_action?(#{fire_on})" + options[:if].unshift("transaction_include_any_action?(#{fire_on})") end end |