Merge remote-tracking branch 'upstream/pull/5221'

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index b958021e8fe587a1b8f04c1f8640d5c71e99d9d4..cac5315775258a68f5e18885605d3fb1b758319e 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -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!