Merge branch 'master' into activestorage-guide

1 files changed, 5 insertions, 14 deletions

diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb
index a01a14cd83..6cf6635c4f 100644
--- a/activestorage/lib/active_storage/engine.rb
+++ b/activestorage/lib/active_storage/engine.rb
@@ -19,9 +19,12 @@ module ActiveStorage
 
     config.eager_load_namespaces << ActiveStorage
 
-    initializer "active_storage.logger" do
+    initializer "active_storage.configs" do
       config.after_initialize do |app|
-        ActiveStorage.logger = app.config.active_storage.logger || Rails.logger
+        ActiveStorage.logger     = app.config.active_storage.logger || Rails.logger
+        ActiveStorage.queue      = app.config.active_storage.queue
+        ActiveStorage.previewers = app.config.active_storage.previewers || []
+        ActiveStorage.analyzers  = app.config.active_storage.analyzers || []
       end
     end
 
@@ -65,17 +68,5 @@ module ActiveStorage
         end
       end
     end
-
-    initializer "active_storage.previewers" do
-      config.after_initialize do |app|
-        ActiveStorage.previewers = app.config.active_storage.previewers || []
-      end
-    end
-
-    initializer "active_storage.analyzers" do
-      config.after_initialize do |app|
-        ActiveStorage.analyzers = app.config.active_storage.analyzers || []
-      end
-    end
   end
 end