summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--version.h2
2 files changed, 4 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index b6810a1ce8..04143be877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,10 @@
Sat Feb 17 01:21:00 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 44aa7ec272..2e6aae49c6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-02-17"
-#define RUBY_PATCHLEVEL 408
+#define RUBY_PATCHLEVEL 409
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 2