diff options
Diffstat (limited to 'railties')
| -rwxr-xr-x | railties/bin/rails | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/bin/rails b/railties/bin/rails index c11d65a08e..82c17cabce 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -git_path = File.join(File.expand_path('../../..', __FILE__), '.git') +git_path = File.expand_path('../../../.git', __FILE__) if File.exist?(git_path) railties_path = File.expand_path('../../lib', __FILE__) diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 3c62e7a4d2..e3e9c501ad 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -324,7 +324,7 @@ module Rails end def self.default_rc_file - File.join(File.expand_path('~'), '.railsrc') + File.expand_path('~/.railsrc') end private |