diff options
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index b30e6ff615..9ef001c7d0 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -71,7 +71,7 @@ module Rails attr_reader :reloaders attr_writer :queue - delegate :default_url_options, :default_url_options=, :to => :routes + delegate :default_url_options, :default_url_options=, to: :routes def initialize super @@ -106,7 +106,7 @@ module Rails def key_generator # number of iterations selected based on consultation with the google security # team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220 - @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, :iterations=>1000) + @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, iterations: 1000) end # Stores some of the Rails initial environment parameters which @@ -198,11 +198,7 @@ module Rails end def queue #:nodoc: - @queue ||= ActiveSupport::QueueContainer.new(build_queue) - end - - def build_queue #:nodoc: - config.queue.new + @queue ||= config.queue || ActiveSupport::Queue.new end def to_app #:nodoc: @@ -290,7 +286,7 @@ module Rails def default_middleware_stack #:nodoc: ActionDispatch::MiddlewareStack.new.tap do |middleware| app = self - if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache + if rack_cache = config.action_dispatch.rack_cache begin require 'rack/cache' rescue LoadError => error @@ -300,9 +296,9 @@ module Rails if rack_cache == true rack_cache = { - :metastore => "rails:/", - :entitystore => "rails:/", - :verbose => false + metastore: "rails:/", + entitystore: "rails:/", + verbose: false } end |