Merge branch 'master' into HEAD

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index ee8d90dc651948269f1b869953ff04774e737307..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__)
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!