naruse	2018-02-19 15:36:03 +0900 (Mon, 19 Feb 2018)

  New Revision: 62482

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

  Log:
    merge revision(s) 61645: [Backport #14333]
    
    Added bundler for `test-bundled-gems` dependency.
    
      rake, did_you_mean, test-unit depends on bundler.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/common.mk
    branches/ruby_2_5/version.h
Index: ruby_2_5/common.mk
===================================================================
--- ruby_2_5/common.mk	(revision 62481)
+++ ruby_2_5/common.mk	(revision 62482)
@@ -1174,7 +1174,7 @@ test-bundled-gems-fetch: $(PREP) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/common.mk#L1174
 
 test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
-		--install-dir .bundle --conservative "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
 test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 62481)
+++ ruby_2_5/version.h	(revision 62482)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
 #define RUBY_RELEASE_DATE "2018-02-19"
-#define RUBY_PATCHLEVEL 22
+#define RUBY_PATCHLEVEL 23
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 62481)
+++ ruby_2_5	(revision 62482)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61645

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