aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-07-27 09:05:41 +0900
committerGitHub <noreply@github.com>2018-07-27 09:05:41 +0900
commitb4d91bb41f9cc555d80d0cb6b0a41179d26fa252 (patch)
treedb235b3475096508d6400010b08ada428968ce2d /activesupport
parente03add224899e0a10e7cfa28c09e68c8b9c920ed (diff)
parent1933fbaecf5efa982c4214fed51d88d120ffe236 (diff)
downloadrails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.tar.gz
rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.tar.bz2
rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.zip
Merge pull request #33441 from bogdanvlviv/remove-rubocop-comments-from-codebase
Remove Rubocop's comments from Rails code base
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/subscriber.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/subscriber.rb b/activesupport/lib/active_support/subscriber.rb
index 54c770ac35..5a4c3d74af 100644
--- a/activesupport/lib/active_support/subscriber.rb
+++ b/activesupport/lib/active_support/subscriber.rb
@@ -88,7 +88,7 @@ module ActiveSupport
end
def finish(name, id, payload)
- event = event_stack.pop
+ event = event_stack.pop
event.finish!
event.payload.merge!(payload)