aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/tasks
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-05-26 12:24:43 +0930
committerGitHub <noreply@github.com>2017-05-26 12:24:43 +0930
commit4cfcf1ee542706c92c6c9b2e973e81b673fb220f (patch)
tree3bd9ec449ab553c73f34ec018f5450938b6831c7 /railties/lib/rails/tasks
parent881823176a3fcaa3711900f2cdfd66b11a6df18a (diff)
parent40bdbce191ad90dfea43dad51fac5c4726b89392 (diff)
downloadrails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.gz
rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.bz2
rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.zip
Merge pull request #29176 from bogdanvlviv/define-path-with__dir__
Define path with __dir__
Diffstat (limited to 'railties/lib/rails/tasks')
-rw-r--r--railties/lib/rails/tasks/framework.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 32a6b109bc..80720a42ff 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -16,7 +16,7 @@ namespace :app do
namespace :templates do
# desc "Copy all the templates from rails to the application directory for customization. Already existing local copies will be overwritten"
task :copy do
- generators_lib = File.expand_path("../../generators", __FILE__)
+ generators_lib = File.expand_path("../generators", __dir__)
project_templates = "#{Rails.root}/lib/templates"
default_templates = { "erb" => %w{controller mailer scaffold},