aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-03-06 09:25:58 +0100
committerXavier Noria <fxn@hashref.com>2016-03-06 09:31:55 +0100
commit5d77e3d2dc39f77f91f0a0024b750217aaef4d30 (patch)
treee645f53e74afc0b54229d70e68ea11950ff4a3a1 /railties/lib/rails
parent598816f630aadc5f63c8e36bc16accd6e15d4fb0 (diff)
downloadrails-5d77e3d2dc39f77f91f0a0024b750217aaef4d30.tar.gz
rails-5d77e3d2dc39f77f91f0a0024b750217aaef4d30.tar.bz2
rails-5d77e3d2dc39f77f91f0a0024b750217aaef4d30.zip
use __dir__ to load the environment in config.ru
Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config.ru2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru
index bd83b25412..9797be5aed 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.
-require ::File.expand_path('../config/environment', __FILE__)
+require ::File.expand_path('config/environment', __dir__)
run Rails.application