diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-19 20:46:26 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-19 20:46:26 -0700 |
| commit | 3a1cac42a544f50b6c31d75c4bacab823070a976 (patch) | |
| tree | e4501cfd29983cf81bc0d9792147168262636bdc | |
| parent | 39dec69712aaf954c0f00f2a32c32356d789e3ed (diff) | |
| parent | 84403ae065a213f40ccce397c7b428ad8b79ec00 (diff) | |
| download | rails-3a1cac42a544f50b6c31d75c4bacab823070a976.tar.gz rails-3a1cac42a544f50b6c31d75c4bacab823070a976.tar.bz2 rails-3a1cac42a544f50b6c31d75c4bacab823070a976.zip | |
Merge pull request #6789 from takoyakikamen/aptests
Correct the AP test。
| -rw-r--r-- | activesupport/lib/active_support/log_subscriber.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb index 720954625a..8c3921c423 100644 --- 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 |