summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Lance <stefan@lances.net>2015-06-24 13:54:49 -0400
committerSamuel E. Giddins <segiddins@segiddins.me>2015-07-16 16:52:00 -0700
commit8bb53f013ce07940a14669b1e6f18ded46bc9b1d (patch)
tree0dc32d37cbd57bae6a8a4976081d0cefd1d6108f
parent2d93db83e6c57b138cabea3f14fb64432cdec994 (diff)
downloadbundler-8bb53f013ce07940a14669b1e6f18ded46bc9b1d.tar.gz
Remove deprecation warning
- It will be displayed in 1-99-dev, instead
-rw-r--r--lib/bundler/settings.rb8
-rw-r--r--spec/commands/show_spec.rb2
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 16308badf4..0e0587f886 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -37,7 +37,6 @@ module Bundler
if @use_current
set_current(key, value)
else
- print_remembered_flags_deprecation_warning unless Bundler.settings["ignore_warnings.remembered_flags"]
set_local(key, value)
end
end
@@ -284,12 +283,5 @@ module Bundler
end
uri
end
-
- def print_remembered_flags_deprecation_warning
- Bundler.ui.warn "Starting in Bundler 2.0, flags passed into commands will no longer be remember past that command." \
- " Instead please set flags you want remembered between commands using `bundle config <setting name> <setting value>`" \
- " To ignore this warning use `bundle config ignore_warnings.remembered_flags true`"
- set_current "ignore_warnings.remembered_flags", true
- end
end
end
diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb
index 096081b6cd..79069ecc6e 100644
--- a/spec/commands/show_spec.rb
+++ b/spec/commands/show_spec.rb
@@ -31,7 +31,7 @@ describe "bundle show" do
end
it "warns if path no longer exists on disk" do
- FileUtils.rm_rf("#{system_gem_path}/gems/rails-2.3.2")
+ FileUtils.rm_rf("#{default_bundle_path}/gems/rails-2.3.2")
bundle "show rails"