diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-19 10:09:43 +0100 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-21 16:32:23 +0100 |
| commit | 76c411d455cbca8cf6cd3dddf1488dd0310f0bd8 (patch) | |
| tree | e2a2e4e3d736858f91754d3d1e51c7f36d2d49a8 | |
| parent | a6f593fe4d32ab2dde6ffd24a623dd8d1b783b5c (diff) | |
| download | bundler-76c411d455cbca8cf6cd3dddf1488dd0310f0bd8.tar.gz | |
Remove major_deprecations feature flag
Leave it as a setting with default true value.
| -rw-r--r-- | lib/bundler/feature_flag.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/settings.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/shared_helpers.rb | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index 5507c38ec3..0adbd9190f 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -44,7 +44,6 @@ module Bundler settings_flag(:init_gems_rb) { bundler_2_mode? } settings_flag(:list_command) { bundler_2_mode? } settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? } - settings_flag(:major_deprecations) { bundler_2_mode? } settings_flag(:only_update_to_newer_versions) { bundler_2_mode? } settings_flag(:path_relative_to_cwd) { bundler_2_mode? } settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") } diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 79690d31aa..15c3ba1881 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -76,6 +76,7 @@ module Bundler ].freeze DEFAULT_CONFIG = { + :major_deprecations => true, :disable_version_check => true, :prefer_patch => false, :redirect => 5, diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index c5c11c723d..e0cb61e03f 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -374,7 +374,7 @@ module Bundler def prints_major_deprecations? require "bundler" - return false unless Bundler.feature_flag.major_deprecations? + return false unless Bundler.settings[:major_deprecations] require "bundler/deprecate" return false if Bundler::Deprecate.skip true |