merge revision(s) 62422,62436: [Backport #14481]

	Merge RubyGems 2.7.6 from upstream.

	It fixed some security vulnerabilities.

	http://blog.rubygems.org/2018/02/15/2.7.6-released.html

	fix regexp literal warning.

	* test/rubygems/test_gem_server.rb: eliminate duplicated character class warning.
	  [Bug #14481]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@62443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index e3ef7ec10d..36b1f00294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,10 @@
 Sat Feb 17 01:24:49 2018  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	load.c: backtrace of circular require
+	Merge RubyGems 2.7.6 from upstream.
 
-	* load.c (load_lock): print backtrace of circular require via
-	  `Warning.warn` [ruby-core:80850] [Bug #13505]
+	It fixed some security vulnerabilities.
 
-	  Send the backtrace of the circular require warning as a single String to Warning.warn
-
-	* load.c: send as a single string.
-	* error.c: expose the string formatted by rb_warning as rb_warning_string().
-	* test/ruby/test_exception.rb: update tests.
-	  [ruby-core:80850] [Bug #13505]
+	http://blog.rubygems.org/2018/02/15/2.7.6-released.html
 
 	fix regexp literal warning.
 
diff --git a/version.h b/version.h
index f05b499d87..bd4d5fdcf2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.9"
 #define RUBY_RELEASE_DATE "2018-02-17"
-#define RUBY_PATCHLEVEL 481
+#define RUBY_PATCHLEVEL 482
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 2