X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..18d26c0d81f1d0e39e90e1339b73037762df4e6f:/config/preinitializer.rb?ds=inline diff --git a/config/preinitializer.rb b/config/preinitializer.rb index 818146c21..de8367e9f 100644 --- a/config/preinitializer.rb +++ b/config/preinitializer.rb @@ -1,9 +1,9 @@ -require 'yaml' +require "yaml" if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? env = "test" else - env = ENV['RAILS_ENV'] || 'development' + env = ENV["RAILS_ENV"] || "development" end config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__)) @@ -15,7 +15,5 @@ ENV.each do |key, value| end config[env].each do |key, value| - unless Object.const_defined?(key.upcase) - Object.const_set(key.upcase, value) - end + Object.const_set(key.upcase, value) unless Object.const_defined?(key.upcase) end