aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2021-09-19 19:43:12 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2021-09-19 19:43:12 +0900
commitac7c2754c004cdb3618738e315d2e2cb5f68a3a8 (patch)
tree03df90d8af800f1747b27a2ae02b5896d432ce7f
parent2a7235421fcd59b449c84306d059f22b4c5f0865 (diff)
downloadruby-ac7c2754c004cdb3618738e315d2e2cb5f68a3a8.tar.gz
merge revision(s) b8386f7f7f6d7a7d76481e02d389d0f5211f0f2c [Backport #18161]
Prepend DebugSystem to VCS class only And revert 24e5f1c982966c379220b1bbb26b4e0320180fa1, pepending to Kernel did not affect the top level methods before 3.0.
-rw-r--r--tool/lib/vcs.rb3
-rw-r--r--version.h8
2 files changed, 4 insertions, 7 deletions
diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 3553ed51a9..fcee91a7a4 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -117,9 +117,6 @@ else
ret
end
end
- module Kernel
- prepend(DebugSystem)
- end
end
class VCS
diff --git a/version.h b/version.h
index b92f4b5145..5128935dd3 100644
--- a/version.h
+++ b/version.h
@@ -1,12 +1,12 @@
# define RUBY_VERSION_MAJOR RUBY_API_VERSION_MAJOR
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
-#define RUBY_VERSION_TEENY 4
+#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 191
+#define RUBY_PATCHLEVEL 192
#define RUBY_RELEASE_YEAR 2021
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 9
+#define RUBY_RELEASE_DAY 19
#include "ruby/version.h"