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

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 171198560fcd3affff765799a1cfb64c32089fee..cac5315775258a68f5e18885605d3fb1b758319e 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
 # Load the Rails application.

-require File.expand_path("../application", __FILE__)
+require_relative "application"

 
 # Initialize the Rails application.
 Rails.application.initialize!
 
 # Initialize the Rails application.
 Rails.application.initialize!