aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-24 10:05:35 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-24 10:05:35 -0800
commitf5c3531ade409f98328e8e05ed5a0d9a8514d308 (patch)
tree8c5ec492cf8fbc14b3e34f130a5f0256afef6a4f /railties
parent8efd5fec75b5241d2b25f547bb0d90fd01bbafbd (diff)
parentcf6c00d027e44a52bfd1df19e2a9cec52fea2c7c (diff)
downloadrails-f5c3531ade409f98328e8e05ed5a0d9a8514d308.tar.gz
rails-f5c3531ade409f98328e8e05ed5a0d9a8514d308.tar.bz2
rails-f5c3531ade409f98328e8e05ed5a0d9a8514d308.zip
Merge pull request #13828 from bronzle/apploader-should-check-for-file
app_rails_loader.rb should check if bin/rails is a File before calling F...
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/app_rails_loader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb
index 1610751844..56f05b3844 100644
--- a/railties/lib/rails/app_rails_loader.rb
+++ b/railties/lib/rails/app_rails_loader.rb
@@ -55,7 +55,7 @@ EOS
end
def self.find_executable
- EXECUTABLES.find { |exe| File.exist?(exe) }
+ EXECUTABLES.find { |exe| File.file?(exe) }
end
end
end