aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2018-10-22 14:53:46 +0200
committerGitHub <noreply@github.com>2018-10-22 14:53:46 +0200
commita918e3c8b1574f5290015fdab3f1c6810740b029 (patch)
tree8bcb7e9aada6d0b8faf0db3eec57cf15c45cbb25
parentced65eb9a71e0cd6bd413a1e9996d942a7946b4a (diff)
parentf8e132d362742ac4a21556732cd0e1cb1ab7427c (diff)
downloadrails-a918e3c8b1574f5290015fdab3f1c6810740b029.tar.gz
rails-a918e3c8b1574f5290015fdab3f1c6810740b029.tar.bz2
rails-a918e3c8b1574f5290015fdab3f1c6810740b029.zip
Merge pull request #34273 from albertoalmagro/improve-event-variable-naming
Rename event variable
-rw-r--r--activesupport/lib/active_support/subscriber.rb8
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)