aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 6b9cbd8cd1..9ada195dd3 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -43,8 +43,8 @@ module Rails
@exceptions_app = nil
@autoflush_log = true
@log_formatter = ActiveSupport::Logger::SimpleFormatter.new
- @queue = ActiveSupport::SynchronousQueue
- @queue_consumer = ActiveSupport::ThreadedQueueConsumer
+ @queue = ActiveSupport::SynchronousQueue.new
+ @queue_consumer = nil
@eager_load = nil
@assets = ActiveSupport::OrderedOptions.new
@@ -75,10 +75,10 @@ module Rails
def paths
@paths ||= begin
paths = super
- paths.add "config/database", :with => "config/database.yml"
- paths.add "config/environment", :with => "config/environment.rb"
+ paths.add "config/database", with: "config/database.yml"
+ paths.add "config/environment", with: "config/environment.rb"
paths.add "lib/templates"
- paths.add "log", :with => "log/#{Rails.env}.log"
+ paths.add "log", with: "log/#{Rails.env}.log"
paths.add "public"
paths.add "public/javascripts"
paths.add "public/stylesheets"