Renamed Orchestra to Notifications once again [#3321 state:resolved]

2 files changed, 7 insertions, 7 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8e0e28c362..fe2dc3769e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -488,12 +488,12 @@ module Rails
       end
     end
 
-    # For each framework, search for instrument file with Orchestra hooks.
+    # For each framework, search for instrument file with Notifications hooks.
     #
-    initializer :load_orchestra_instrumentation do
+    initializer :load_notifications_hooks do
       config.frameworks.each do |framework|
         begin
-          require "#{framework}/instrument"
+          require "#{framework}/notifications"
         rescue LoadError => e
         end
       end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 3d9ae46786..3cb39245ff 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -290,12 +290,12 @@ module Rails
       end
     end
 
-    # Allows Orchestra queue to be modified.
+    # Allows Notifications queue to be modified.
     #
-    #   config.orchestra.queue = MyNewQueue.new
+    #   config.notifications.queue = MyNewQueue.new
     #
-    def orchestra
-      ActiveSupport::Orchestra
+    def notifications
+      ActiveSupport::Notifications
     end
 
     class Generators #:nodoc: