diff options
| author | Asutosh Palai <asupalai@gmail.com> | 2016-07-26 22:34:49 +0530 |
|---|---|---|
| committer | Asutosh Palai <asupalai@gmail.com> | 2016-08-16 09:46:18 +0530 |
| commit | df68550b599a700419a5fcdb6b9249156f5ac046 (patch) | |
| tree | 5feeedcc03644048fb00a86f7b788f24fb4686c6 | |
| parent | 7ec9e457bd939f4565d35c5b064401933763d020 (diff) | |
| download | bundler-df68550b599a700419a5fcdb6b9249156f5ac046.tar.gz | |
rebase fixes
| -rw-r--r-- | lib/bundler.rb | 1 | ||||
| -rw-r--r-- | spec/support/helpers.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 8b3f60d36a..6a39a6359d 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -405,6 +405,7 @@ EOF rubygems.undo_replacements rubygems.reset @rubygems = nil + Plugin.reset! end private diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 426b492da2..fe79604f30 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -16,7 +16,6 @@ module Spec Bundler.reset! Bundler.ui = nil Bundler.ui # force it to initialize - Plugin.reset! end def self.bang(method) |