diff options
| author | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-22 20:06:45 -0300 |
|---|---|---|
| committer | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-22 20:06:45 -0300 |
| commit | 47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8 (patch) | |
| tree | 26d0a84a3cefd153b5315c37addb784e1b9228f3 /activesupport/lib/active_support/subscriber.rb | |
| parent | c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397 (diff) | |
| parent | e853acb9b4cfb5bb91a241cf37084631cd145823 (diff) | |
| download | rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.tar.gz rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.tar.bz2 rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.zip | |
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'activesupport/lib/active_support/subscriber.rb')
| -rw-r--r-- | activesupport/lib/active_support/subscriber.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/subscriber.rb b/activesupport/lib/active_support/subscriber.rb index 9562149f8d..f3e902f9dd 100644 --- a/activesupport/lib/active_support/subscriber.rb +++ b/activesupport/lib/active_support/subscriber.rb @@ -79,12 +79,12 @@ module ActiveSupport end def start(name, id, payload) - e = ActiveSupport::Notifications::Event.new(name, nil, nil, id, payload) - e.start! + event = ActiveSupport::Notifications::Event.new(name, nil, nil, id, payload) + event.start! parent = event_stack.last - parent << e if parent + parent << event if parent - event_stack.push e + event_stack.push event end def finish(name, id, payload) |