summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsutosh Palai <asupalai@gmail.com>2016-08-16 09:57:07 +0530
committerAsutosh Palai <asupalai@gmail.com>2016-08-16 18:36:26 +0530
commitde6580727886bb25503830d51869213d67a83b77 (patch)
tree619ed3259635eff6ecc2496b13d73d1eeea78141
parent17e3785ee6419c4c677da61b8155bd457aa1ce86 (diff)
downloadbundler-de6580727886bb25503830d51869213d67a83b77.tar.gz
fixes missed during rebase
-rw-r--r--lib/bundler/cli/install.rb2
-rw-r--r--spec/bundler/plugin/index_spec.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index f95b2779c2..5c7b8c5b0b 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -68,8 +68,6 @@ module Bundler
definition = Bundler.definition
definition.validate_ruby!
- Plugin.hook("before-install-all", definition.dependencies)
-
installer = Installer.install(Bundler.root, definition, options)
Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.settings[:frozen]
diff --git a/spec/bundler/plugin/index_spec.rb b/spec/bundler/plugin/index_spec.rb
index 249628a46e..5a754f355c 100644
--- a/spec/bundler/plugin/index_spec.rb
+++ b/spec/bundler/plugin/index_spec.rb
@@ -110,7 +110,7 @@ describe Bundler::Plugin::Index do
Dir.chdir(tmp) do
Bundler::Plugin.reset!
path = lib_path("gplugin")
- index.register_plugin("gplugin", path.to_s, [path.join("lib").to_s], [], ["glb_source"])
+ index.register_plugin("gplugin", path.to_s, [path.join("lib").to_s], [], ["glb_source"], [])
end
end