diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-17 11:51:42 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-17 11:51:42 -0200 |
| commit | 94de3979dd1be17a9e324551e6786af4a90a6909 (patch) | |
| tree | 7eb3e4b70cca058cf0b1da84020a7b2ead21113b /railties | |
| parent | 549577193875e151b9afab28bf32e86e879a53a6 (diff) | |
| parent | 2cfaa22d3829e89ff06cfdc5467e16a7921c62ef (diff) | |
| download | rails-94de3979dd1be17a9e324551e6786af4a90a6909.tar.gz rails-94de3979dd1be17a9e324551e6786af4a90a6909.tar.bz2 rails-94de3979dd1be17a9e324551e6786af4a90a6909.zip | |
Merge pull request #17640 from michaeljayt/spring-not-working-in-cygwin
Skip spring install in Cygwin due to fork() bad support.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 92ed9136a0..b651623b53 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -342,7 +342,7 @@ module Rails end def spring_install? - !options[:skip_spring] && Process.respond_to?(:fork) + !options[:skip_spring] && Process.respond_to?(:fork) && !RUBY_PLATFORM.include?("cygwin") end def run_bundle |