aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/lib/active_support/notifications.rb1
-rw-r--r--railties/test/application/notifications_test.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 8e705a4eaa..139c66b1e1 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -1,6 +1,7 @@
require 'thread'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/secure_random'
module ActiveSupport
# Notifications provides an instrumentation API for Ruby. To instrument an
diff --git a/railties/test/application/notifications_test.rb b/railties/test/application/notifications_test.rb
index 83c18be057..62ed4f4ad4 100644
--- a/railties/test/application/notifications_test.rb
+++ b/railties/test/application/notifications_test.rb
@@ -12,7 +12,7 @@ module ApplicationTests
@subscribers = []
end
- def publish(name, payload=nil)
+ def publish(name, *args)
@events << name
end