aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-11-05 01:35:28 -0800
committerYves Senn <yves.senn@gmail.com>2013-11-05 01:35:28 -0800
commit7d17b1dedbce7daf5c5c5b39eff1c2f5661fab0e (patch)
tree4b36b61e883682a2fc6f846ef9f4b91028343c86 /railties/lib/rails/generators
parent026d0555685087845b74dd87a0417b5a164b1c13 (diff)
parent01ef2c1943cd813f3fd262602f518640f66db834 (diff)
downloadrails-7d17b1dedbce7daf5c5c5b39eff1c2f5661fab0e.tar.gz
rails-7d17b1dedbce7daf5c5c5b39eff1c2f5661fab0e.tar.bz2
rails-7d17b1dedbce7daf5c5c5b39eff1c2f5661fab0e.zip
Merge pull request #12752 from notalex/expand_path_refactoring
Refactor File.expand_path usage to remove additional File.join
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2610d3a1dd..a2023886cd 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -326,7 +326,7 @@ module Rails
end
def self.default_rc_file
- File.join(File.expand_path('~'), '.railsrc')
+ File.expand_path('~/.railsrc')
end
private