Merge branch 'master' of github.com:rails/rails

1 files changed, 20 insertions, 0 deletions

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 945063e55c..59c3c56e59 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -22,6 +22,7 @@ end
 module Rails
   autoload :Info, 'rails/info'
   autoload :InfoController, 'rails/info_controller'
+  autoload :Queueing, 'rails/queueing'
 
   class << self
     def application
@@ -37,6 +38,25 @@ module Rails
       application.config
     end
 
+    # Rails.queue is the application's queue. You can push a job onto
+    # the queue by:
+    #
+    #   Rails.queue.push job
+    #
+    # A job is an object that responds to +run+. Queue consumers will
+    # pop jobs off of the queue and invoke the queue's +run+ method.
+    #
+    # Note that depending on your queue implementation, jobs may not
+    # be executed in the same process as they were created in, and
+    # are never executed in the same thread as they were created in.
+    #
+    # If necessary, a queue implementation may need to serialize your
+    # job for distribution to another process. The documentation of
+    # your queue will specify the requirements for that serialization.
+    def queue
+      application.queue
+    end
+
     def initialize!
       application.initialize!
     end