X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..b68b29b43c2e385af05d81815e347c2ab22ed269:/config/preinitializer.rb

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index de8367e9f..07f105722 100644
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -1,17 +1,15 @@
 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
+  Object.const_set(Regexp.last_match(1).upcase, value) if key =~ /^OSM_(.*)$/
 end
 
 config[env].each do |key, value|