aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-03-06 09:47:42 +0100
committerXavier Noria <fxn@hashref.com>2016-03-06 09:47:42 +0100
commit5a06beda7e44185ef2a1bbbee58d682ad77a1bd7 (patch)
tree1bdc0b3728fd822a75d31452bd86e8171c6f6903 /railties
parent5d77e3d2dc39f77f91f0a0024b750217aaef4d30 (diff)
downloadrails-5a06beda7e44185ef2a1bbbee58d682ad77a1bd7.tar.gz
rails-5a06beda7e44185ef2a1bbbee58d682ad77a1bd7.tar.bz2
rails-5a06beda7e44185ef2a1bbbee58d682ad77a1bd7.zip
use __dir__ to load the application in environment.rb
Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
index ee8d90dc65..0b8bdd8289 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
@@ -1,5 +1,5 @@
# Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
# Initialize the Rails application.
Rails.application.initialize!