Merge branch 'master' into HEAD

[rails.git] / config / preinitializer.rb

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
deleted file mode 100644 (file)
index 07f1057..0000000
--- a/config/preinitializer.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "yaml"
-
-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|
-  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