From: Andy Allan Date: Wed, 13 Mar 2019 15:40:31 +0000 (+0100) Subject: Drop the old environment variable parsing X-Git-Tag: live~2651^2~6 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5eef38a6b621d824a4566739241e5689fe6ea383?hp=d102c9aaf478a4bad52a72b1b72470ba35ba464e Drop the old environment variable parsing It's likely unused, and incompatible with environment variable parsing from Config --- diff --git a/config/preinitializer.rb b/config/preinitializer.rb index 07f105722..253f58605 100644 --- a/config/preinitializer.rb +++ b/config/preinitializer.rb @@ -8,10 +8,6 @@ env = if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^( config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__)) -ENV.each do |key, value| - Object.const_set(Regexp.last_match(1).upcase, value) if key =~ /^OSM_(.*)$/ -end - config[env].each do |key, value| Object.const_set(key.upcase, value) unless Object.const_defined?(key.upcase) end