From 69371b0d9d2f817468ca69005868724885c2ebe5 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 6 Mar 2016 09:59:40 +0100 Subject: use __dir__ for relative paths in config/application.rb Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c. --- railties/lib/rails/generators/rails/app/templates/config/application.rb | 2 +- .../lib/rails/generators/rails/plugin/templates/rails/application.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib') 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' -- cgit v1.2.3