Merge pull request #6789 from takoyakikamen/aptests

Correct the AP test。
2022-11-09 12:12:34 -05:00 · 2012-06-19 20:46:26 -07:00 · 2012-06-19 20:46:26 -07:00 · 3a1cac42a5
commit 3a1cac42a5
parent 39dec69712 84403ae065
1 changed files with 1 additions and 0 deletions
--- a/activesupport/lib/active_support/log_subscriber.rb
+++ b/activesupport/lib/active_support/log_subscriber.rb
@ -111,6 +111,7 @@ module ActiveSupport
      finished  = Time.now
      event     = @event_stack.pop
      event.end = finished
+      event.payload.merge!(payload)

      method = name.split('.').first
      begin