Skip to content

Commit d7b3951

Browse files
authored
Merge pull request rails#49428 from uxxman/main
No need to include error_highlight when ruby version >= 3.2
2 parents db2ef1d + 24b9991 commit d7b3951

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,6 @@ gem "wdm", ">= 0.1.0", platforms: [:windows]
193193
# The error_highlight gem only works on CRuby 3.1 or later.
194194
# Also, Rails depends on a new API available since error_highlight 0.4.0.
195195
# (Note that Ruby 3.1 bundles error_highlight 0.3.0.)
196-
if RUBY_VERSION >= "3.1"
196+
if RUBY_VERSION >= "3.1" && RUBY_VERSION < "3.2"
197197
gem "error_highlight", ">= 0.4.0", platforms: [:ruby]
198198
end

Gemfile.lock

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ GEM
203203
rake (>= 12.0.0, < 14.0.0)
204204
drb (2.1.1)
205205
ruby2_keywords
206-
error_highlight (0.5.1)
207206
erubi (1.12.0)
208207
et-orbi (1.2.7)
209208
tzinfo
@@ -584,7 +583,6 @@ DEPENDENCIES
584583
debug (>= 1.1.0)
585584
delayed_job
586585
delayed_job_active_record
587-
error_highlight (>= 0.4.0)
588586
google-cloud-storage (~> 1.11)
589587
image_processing (~> 1.2)
590588
importmap-rails

railties/lib/rails/generators/rails/app/templates/Gemfile.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ group :development do
5151
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
5252
# gem "spring"
5353

54-
<%- if RUBY_VERSION >= "3.1" -%>
54+
<%- if RUBY_VERSION >= "3.1" && RUBY_VERSION < "3.2" -%>
5555
gem "error_highlight", ">= 0.4.0", platforms: [:ruby]
5656
<%- end -%>
5757
end

0 commit comments

Comments
 (0)