From fc9509bdd246a1817119af5cfa4dc36de992b35a Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 27 Nov 2018 12:08:19 +0000 Subject: Merge bundler-2.0.0.pre.2 from upstream. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/bundler/dsl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/bundler/dsl.rb') diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 2cdfe338ea..90ac073c36 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -474,7 +474,7 @@ repo_name ||= user_name msg = "This Gemfile contains multiple primary sources. " \ "Each source after the first must include a block to indicate which gems " \ "should come from that source" - unless Bundler.feature_flag.bundler_2_mode? + unless Bundler.feature_flag.bundler_3_mode? msg += ". To downgrade this error to a warning, run " \ "`bundle config --delete disable_multisource`" end @@ -499,7 +499,7 @@ repo_name ||= user_name end Bundler::SharedHelpers.major_deprecation 3, <<-EOS -The :#{name} git source is deprecated, and will be removed in Bundler 2.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work: +The :#{name} git source is deprecated, and will be removed in Bundler 3.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work: git_source(:#{name}) #{replacement} -- cgit v1.2.3