Merge remote-tracking branch 'parent/main' into upstream-20240517

2024-05-17 08:53:59 +09:00 · 2024-05-17 08:53:59 +09:00 · 094ff9d2ee
commit 094ff9d2ee
parent d5e9bc5247 b2388be71e
153 changed files with 1412 additions and 631 deletions
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@ -25,14 +25,11 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
  end

  def ruby_version
-    yjit = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
-    value = "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}#{yjit ? ' +YJIT' : ''}"
-
    {
      key: 'ruby',
      human_key: 'Ruby',
-      value: value,
-      human_value: value,
+      value: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+      human_value: RUBY_DESCRIPTION,
    }
  end