Merge pull request #49428 from uxxman/main

No need to include error_highlight when ruby version >= 3.2
rails · Sep 29, 2023 · d7b3951 · d7b3951
2 parents db2ef1d + 24b9991
commit d7b3951
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -193,6 +193,6 @@ gem "wdm", ">= 0.1.0", platforms: [:windows]
 # The error_highlight gem only works on CRuby 3.1 or later.
 # Also, Rails depends on a new API available since error_highlight 0.4.0.
 # (Note that Ruby 3.1 bundles error_highlight 0.3.0.)
-if RUBY_VERSION >= "3.1"
+if RUBY_VERSION >= "3.1" && RUBY_VERSION < "3.2"
   gem "error_highlight", ">= 0.4.0", platforms: [:ruby]
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -203,7 +203,6 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     drb (2.1.1)
       ruby2_keywords
-    error_highlight (0.5.1)
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -584,7 +583,6 @@ DEPENDENCIES
   debug (>= 1.1.0)
   delayed_job
   delayed_job_active_record
-  error_highlight (>= 0.4.0)
   google-cloud-storage (~> 1.11)
   image_processing (~> 1.2)
   importmap-rails

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt
@@ -51,7 +51,7 @@ group :development do
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
 
-<%- if RUBY_VERSION >= "3.1" -%>
+<%- if RUBY_VERSION >= "3.1" && RUBY_VERSION < "3.2" -%>
   gem "error_highlight", ">= 0.4.0", platforms: [:ruby]
 <%- end -%>
 end