hsbt	2018-12-05 08:33:29 +0900 (Wed, 05 Dec 2018)

  New Revision: 66204

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66204

  Log:
    Merge 2-0-stable branch from bundler/bundler.
    
      It's release version of Bundler 2

  Modified files:
    trunk/lib/bundler/version.rb
    trunk/spec/bundler/commands/inject_spec.rb
    trunk/spec/bundler/realworld/edgecases_spec.rb
Index: spec/bundler/realworld/edgecases_spec.rb
===================================================================
--- spec/bundler/realworld/edgecases_spec.rb	(revision 66203)
+++ spec/bundler/realworld/edgecases_spec.rb	(revision 66204)
@@ -188,7 +188,7 @@ RSpec.describe "real world edgecases", : https://github.com/ruby/ruby/blob/trunk/spec/bundler/realworld/edgecases_spec.rb#L188
             activemodel (= 4.2.7.1)
             activerecord (= 4.2.7.1)
             activesupport (= 4.2.7.1)
-            bundler (>= 1.3.0, < 2.0)
+            bundler (>= 1.3.0, < 3.0)
             railties (= 4.2.7.1)
             sprockets-rails
           rails-deprecated_sanitizer (1.0.3)
Index: spec/bundler/commands/inject_spec.rb
===================================================================
--- spec/bundler/commands/inject_spec.rb	(revision 66203)
+++ spec/bundler/commands/inject_spec.rb	(revision 66204)
@@ -79,7 +79,7 @@ Usage: "bundle inject GEM VERSION" https://github.com/ruby/ruby/blob/trunk/spec/bundler/commands/inject_spec.rb#L79
   context "when frozen" do
     before do
       bundle "install"
-      if Bundler.feature_flag.bundler_2_mode?
+      if Bundler.feature_flag.bundler_3_mode?
         bundle! "config --local deployment true"
       else
         bundle! "config --local frozen true"
Index: lib/bundler/version.rb
===================================================================
--- lib/bundler/version.rb	(revision 66203)
+++ lib/bundler/version.rb	(revision 66204)
@@ -7,7 +7,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/version.rb#L7
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "2.0.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "2.0.0" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/