From c10a78124c1c32f8ce3a92888863b9b258efcc06 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Fri, 1 Nov 2013 10:39:06 +0100 Subject: More Warnings removed for ruby trunk Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb --- railties/bin/rails | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/bin') diff --git a/railties/bin/rails b/railties/bin/rails index b3026e8a93..c11d65a08e 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -2,7 +2,7 @@ git_path = File.join(File.expand_path('../../..', __FILE__), '.git') -if File.exists?(git_path) +if File.exist?(git_path) railties_path = File.expand_path('../../lib', __FILE__) $:.unshift(railties_path) end -- cgit v1.2.3 From 01ef2c1943cd813f3fd262602f518640f66db834 Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Mon, 4 Nov 2013 17:27:23 +0530 Subject: Refactor File.expand_path usage to remove additional File.join --- railties/bin/rails | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/bin') 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__) -- cgit v1.2.3