Skip to content

Commit 621186f

Browse files
authoredMar 3, 2025··
Merge pull request #1939 from denny/upgrade/rails-7.1-ruby-3.4
Upgrade time again! Rails 7.1, Ruby 3.4
2 parents 1b4b1fe + dfe2676 commit 621186f

File tree

31 files changed

+230
-148
lines changed

31 files changed

+230
-148
lines changed
 

Diff for: ‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ version: 2
1212

1313
references:
1414
app: &app
15-
image: cimg/ruby:3.2.7-node
15+
image: cimg/ruby:3.4.2-node
1616
environment:
1717
BUNDLE_JOBS: 3
1818
BUNDLE_RETRY: 3

Diff for: ‎.pryrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ AmazingPrint.pry!
1414

1515
# Show app name and current environment in console prompt.
1616
# Environment is colour-coded to indicate how careful you should be :)
17-
if Rails.env.development? || Rails.env.test? || ENV[ 'SHINYCMS_PRY_CONSOLE' ]&.downcase == 'true'
17+
if Rails.env.local? || ENV[ 'SHINYCMS_PRY_CONSOLE' ]&.downcase == 'true'
1818
def prompt_name( name )
1919
return name unless name.is_a?( Pry::Config )
2020

Diff for: ‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.7
1+
3.4.2

Diff for: ‎Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ruby "~> #{helper.ruby_version}" # get version from .ruby-version file (DRY)
1313

1414
source 'https://rubygems.org'
1515
source 'https://rubygems.org' do
16-
# Rails 7.0
17-
gem 'rails', '~> 7.0.8'
16+
# Rails 7.1
17+
gem 'rails', '~> 7.1.5'
1818

1919
# Load ENV from .env(.*) files
2020
gem 'dotenv-rails', require: 'dotenv/load'

0 commit comments

Comments
 (0)
Please sign in to comment.