Skip to content

Commit 167abbd

Browse files
authored
Merge pull request rails#53072 from yahonda/ruby320_ships_rubygems341
2 parents 35533c1 + 9706210 commit 167abbd

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

railties/lib/rails/generators/base.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,6 @@ def self.default_generator_root # :doc:
423423
path = File.expand_path(File.join(base_name, generator_name), base_root)
424424
path if File.exist?(path)
425425
end
426-
427-
def gem_ruby_version
428-
Gem::Version.new(Gem::VERSION) >= Gem::Version.new("3.3.13") ? Gem.ruby_version : RUBY_VERSION
429-
end
430426
end
431427
end
432428
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
99

1010
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
11-
ARG RUBY_VERSION=<%= gem_ruby_version %>
11+
ARG RUBY_VERSION=<%= Gem.ruby_version %>
1212
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1313

1414
# Rails app lives here
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
2-
ARG RUBY_VERSION=<%= gem_ruby_version %>
2+
ARG RUBY_VERSION=<%= Gem.ruby_version %>
33
FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION

railties/test/generators/generators_test_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ def run_app_update(app_root = destination_root, flags: "--force")
151151
private
152152
def gemfile_locals
153153
{
154-
gem_ruby_version: RUBY_VERSION,
155154
rails_prerelease: false,
156155
skip_active_storage: true,
157156
depend_on_bootsnap: false,

0 commit comments

Comments
 (0)