Merge remote-tracking branch 'upstream/pull/2052'
[rails.git] / config / environment.rb
index b958021..cac5315 100644 (file)
@@ -1,5 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
+# Load the Rails application.
+require_relative "application"
 
-# Initialize the rails application
-OpenStreetMap::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!