Skip to content

Commit

Permalink
Merge pull request #175 from MITLibraries/rails72
Browse files Browse the repository at this point in the history
Rails 7.2 upgrade
  • Loading branch information
JPrevost authored Jan 24, 2025
2 parents f3c9c28 + d504e59 commit a8d97e1
Show file tree
Hide file tree
Showing 24 changed files with 341 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
ARG RUBY_VERSION=3.2.2
ARG RUBY_VERSION=3.4.1
FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require:
- rubocop-rails

AllCops:
TargetRubyVersion: 3.2
TargetRubyVersion: 3.3
NewCops: enable
Exclude:
- "db/**/*"
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.2.2
ruby-3.4.1
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '3.2.2'
ruby '3.4.1'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
Expand All @@ -15,6 +15,8 @@ gem 'bootsnap', require: false
# Use CanCanCan for authorization
gem 'cancancan'

gem 'csv'

# Use Devise for authentication
gem 'devise'

Expand Down Expand Up @@ -50,7 +52,7 @@ gem 'puma', '>= 5.0'
gem 'scout_apm'

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '~> 7.1.2'
gem 'rails', '~> 7.2.2'

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem 'sprockets-rails'
Expand Down Expand Up @@ -99,8 +101,7 @@ group :development, :test do
gem 'dotenv-rails'

# Use sqlite as the database for Active Record in dev and test
# This needs to be 1.7 until we figure out how to avoid the problem of forked processes that we ran into with 2.x
gem 'sqlite3', '~> 1.7'
gem 'sqlite3'
end

group :development do
Expand Down
Loading

0 comments on commit a8d97e1

Please sign in to comment.