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

[rails.git] / config.ru

diff --git a/config.ru b/config.ru
index 193e5fed8d68ef689293fa249e2d7c9d1608176f..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.
 
 # This file is used by Rack-based servers to start the application.
 

-require ::File.expand_path("../config/environment", __FILE__)
+require_relative "config/environment"
+

 run Rails.application
 run Rails.application

+Rails.application.load_server