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

[rails.git] / config.ru

diff --git a/config.ru b/config.ru
index 205abe3536eb70da0ef5fc25dbdace5e48e92a97..4a3c09a6889a97a54af8cbcc1a47e03e58cce376 100644 (file)
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
-run OpenStreetMap::Application
+require_relative "config/environment"
+
+run Rails.application
+Rails.application.load_server