mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Refactor File.expand_path usage to remove additional File.join
This commit is contained in:
parent
84eac5dab8
commit
01ef2c1943
3 changed files with 3 additions and 3 deletions
|
@ -52,7 +52,7 @@ module AbstractController
|
|||
class AbstractInvalidHelpers < AbstractHelpers
|
||||
include ActionController::Helpers
|
||||
|
||||
path = File.join(File.expand_path('../../../fixtures', __FILE__), "helpers_missing")
|
||||
path = File.expand_path('../../../fixtures/helpers_missing', __FILE__)
|
||||
$:.unshift(path)
|
||||
self.helpers_path = path
|
||||
end
|
||||
|
|
|
@ -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__)
|
||||
|
|
|
@ -324,7 +324,7 @@ module Rails
|
|||
end
|
||||
|
||||
def self.default_rc_file
|
||||
File.join(File.expand_path('~'), '.railsrc')
|
||||
File.expand_path('~/.railsrc')
|
||||
end
|
||||
|
||||
private
|
||||
|
|
Loading…
Reference in a new issue