diff options
| author | Colby Swandale <me@colby.fyi> | 2018-11-04 21:38:20 +1100 |
|---|---|---|
| committer | Colby Swandale <me@colby.fyi> | 2018-11-08 21:54:56 +1100 |
| commit | 856da395b4920fcecb1375462e0fd899cb61f6bf (patch) | |
| tree | 7b3adceafccf56b376e8a7ac773c7a124a5f4bf1 | |
| parent | 11b34e0541eafa475f9ba8437938bb747d23fbe4 (diff) | |
| download | bundler-856da395b4920fcecb1375462e0fd899cb61f6bf.tar.gz | |
puts major upgrade warning under a feature flag
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/feature_flag.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/settings.rb | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 8e56d4a9bc..c5e94c7123 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -331,7 +331,7 @@ module Bundler # i.e., Windows with `git config core.autocrlf=true` contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n") - if @locked_bundler_version + if @locked_bundler_version && Bundler.feature_flag.lockfile_upgrade_warning? locked_major = @locked_bundler_version.segments.first current_major = Gem::Version.create(Bundler::VERSION).segments.first diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index 15ba825c51..e3266da8ab 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -44,6 +44,7 @@ module Bundler settings_flag(:init_gems_rb) { bundler_3_mode? } settings_flag(:list_command) { bundler_3_mode? } settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_3_mode? } + settings_flag(:lockfile_upgrade_warning) { bundler_3_mode? } settings_flag(:only_update_to_newer_versions) { bundler_3_mode? } settings_flag(:path_relative_to_cwd) { bundler_3_mode? } settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") } diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index f7077f71d4..66af31dab2 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -40,6 +40,7 @@ module Bundler ignore_messages init_gems_rb list_command + lockfile_upgrade_warning lockfile_uses_separate_rubygems_sources major_deprecations no_install |