diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-03-06 09:59:40 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2016-03-06 09:59:40 +0100 |
| commit | 69371b0d9d2f817468ca69005868724885c2ebe5 (patch) | |
| tree | c07f5e540afef6c8c6c129dc4a2081a92d9ce3f7 /railties/lib | |
| parent | 7d6a8320ee6acc8a54c091eea8607eb8f8ed1423 (diff) | |
| download | rails-69371b0d9d2f817468ca69005868724885c2ebe5.tar.gz rails-69371b0d9d2f817468ca69005868724885c2ebe5.tar.bz2 rails-69371b0d9d2f817468ca69005868724885c2ebe5.zip | |
use __dir__ for relative paths in config/application.rb
Stuff I see in passing while I am doing a walkthrough.
See rationale in 5b8738c.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/rails/application.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index cb83364360..bd4e05fc90 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -1,4 +1,4 @@ -require File.expand_path('../boot', __FILE__) +require File.expand_path('boot', __dir__) <% if include_all_railties? -%> require 'rails/all' diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb index b1038c839e..bb683ab9cc 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb @@ -1,4 +1,4 @@ -require File.expand_path('../boot', __FILE__) +require File.expand_path('boot', __dir__) <% if include_all_railties? -%> require 'rails/all' |