Drop the old environment variable parsing

[rails.git] / config / preinitializer.rb

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index de8367e9f81cbadd4cdc937e96176b2a0dfa572d..253f58605f798ef54a6f40acc926c02d49593091 100644 (file)
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -1,19 +1,13 @@
 require "yaml"
 
-if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
-  env = "test"
-else
-  env = ENV["RAILS_ENV"] || "development"
-end
+env = if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
+        "test"
+      else
+        ENV["RAILS_ENV"] || "development"
+      end
 
 config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__))
 
-ENV.each do |key, value|
-  if key.match(/^OSM_(.*)$/)
-    Object.const_set(Regexp.last_match(1).upcase, value)
-  end
-end
-
 config[env].each do |key, value|
   Object.const_set(key.upcase, value) unless Object.const_defined?(key.upcase)
 end