Merge Bundler 2.1.0.pre.1 as developed version from upstream.

  https://github.com/bundler/bundler/commit/a53709556b95a914e874b22ed2116a46b0528852

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 9 deletions

diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index b49cfb6703..49143b38f9 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -221,7 +221,7 @@ module Bundler
     def processor_count
       require "etc"
       Etc.nprocessors
-    rescue
+    rescue StandardError
       1
     end
 
@@ -275,14 +275,7 @@ module Bundler
     end
 
     def can_install_in_parallel?
-      if Bundler.rubygems.provides?(">= 2.1.0")
-        true
-      else
-        Bundler.ui.warn "RubyGems #{Gem::VERSION} is not threadsafe, so your "\
-          "gems will be installed one at a time. Upgrade to RubyGems 2.1.0 " \
-          "or higher to enable parallel gem installation."
-        false
-      end
+      true
     end
 
     def install_in_parallel(size, standalone, force = false)