Fix merge conflict with gem_push patch.

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index 06de00dc40..50c4dca982 100644
--- a/lib/bundler/gem_helper.rb
+++ b/lib/bundler/gem_helper.rb
@@ -73,7 +73,7 @@ module Bundler
       guard_clean
       built_gem_path = build_gem
       tag_version { git_push } unless already_tagged?
-      rubygem_push(built_gem_path)
+      rubygem_push(built_gem_path) if gem_push?
     end
 
     protected
@@ -156,5 +156,9 @@ module Bundler
       }
       [outbuf, $?]
     end
+
+    def gem_push?
+      ! %w{n no nil false off 0}.include?(ENV['gem_push'].to_s.downcase)
+    end
   end
 end