Skip to content

Upgrade to Rails 8.1 beta #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elasticspoon merged 19 commits into from
Sep 13, 2025
Merged

Upgrade to Rails 8.1 beta #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d659332
Rails 7.0 upgrade - wip - rails admin for enum models issues
marc Sep 12, 2025
5f836af
Rails 7.1 upgrade. wip - tests passed but there might be a seeding issue
marc Sep 13, 2025
eecaef4
Handle missing/problem images with Rails 7.1 stricter sprockets assets
johnpaulashenfelter Sep 13, 2025
6339d65
Fixed: concurrent_ruby issue doesn't exist in this version of ruby an…
johnpaulashenfelter Sep 13, 2025
8dacde4
Remove unused initializers.
marc Sep 13, 2025
3452874
Rails 7.2.2.2 upgrade. Tests are passing.
marc Sep 13, 2025
e5b875d
Add a missing image for content, generated with ChatGPT
johnpaulashenfelter Sep 13, 2025
ca972bb
Rails 8.0 upgrade. All tests are passing.
marc Sep 13, 2025
a3dbaa4
Rails 8.1.0.beta1 upgrade. All tests are passing.
marc Sep 13, 2025
612994d
Merge branch 'main' into feature/rails81beta
elasticspoon Sep 13, 2025
522a9cc
Attempt to fix CI error related to Rails Admin.
marc Sep 13, 2025
126682f
Attempt to fix failing CI tests. (Passes locally in docker.)
marc Sep 13, 2025
bbf8dc0
Testing alternate config for CI tests.
marc Sep 13, 2025
1658f3d
Add libyaml-dev for staging/prod docker.
marc Sep 13, 2025
41b20d3
Fix Dockerfile bundle install.
marc Sep 13, 2025
de3e84d
feat: remove rails admin
elasticspoon Sep 13, 2025
9357fae
fix: registration spec
elasticspoon Sep 13, 2025
77786c5
fix: event spec
elasticspoon Sep 13, 2025
6624e51
fix: gemfile
elasticspoon Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN apt-get update -qq && apt-get install -y \
libffi-dev \
libreadline-dev \
libssl-dev \
libyaml-dev \
zlib1g-dev

# Copy app code and install dependencies
Expand Down
24 changes: 8 additions & 16 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,28 @@ source 'https://rubygems.org'

ruby "3.3.8"

gem "rails", "~> 6.1.7"

# TODO Consider removing these after upgrading Rails. These are a Ruby 3.3 => 3.4 warning.
# add required gems leaving standard library to avoid log noise
gem "bigdecimal"
gem "drb"
gem "mutex_m"
gem "observer"

gem "rails", "8.1.0.beta1"

gem 'sprockets-rails', '~> 3.2.2'
gem "activerecord-trilogy-adapter" # for mysql installation
gem 'trilogy'
Copy link
Collaborator

@maebeale maebeale Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasn't this already in there?

Copy link
Collaborator Author

@marc marc Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think trilogy was indirectly loaded as a dependency for activerecord-trilogy-adapter. That is no longer needed as of rails 7.1+, so I added just the trilogy adapter.

# gem "activerecord-trilogy-adapter" # no longer needed for rails 7.1+
gem 'bootstrap-sass'
gem "sassc-rails", ">= 2.1.2"
gem "sassc-rails"
gem 'uglifier'
gem 'coffee-rails'
gem "feature_flipper"

gem 'jquery-rails'
gem 'jbuilder', '~> 2.0'

gem 'devise', '~> 4.7.3'
gem 'devise', '~> 4.9.4'
gem 'neat', '1.7.1'
gem 'bourbon', '~> 4.2.2'
gem 'draper'
gem "kt-paperclip", "~> 6.4", ">= 6.4.1"
gem "kt-paperclip", "~> 7.1.1"
gem 'aws-sdk-s3'

gem 'puma', '~> 5.6' # Add Puma as the web server
gem 'puma', '~> 6.0' # Add Puma as the web server

gem 'cocoon', '~> 1.2.6'

Expand All @@ -41,7 +34,7 @@ gem 'jwt', '~> 1.2.1'
gem 'httparty'
gem 'will_paginate', '~> 3.1.7'
gem 'bootstrap-will_paginate'
gem 'apipie-rails', '~> 0.5.0'
gem 'apipie-rails', '~> 1.5.0'
gem 'rack-cors', :require => 'rack/cors'
gem 'ckeditor', '~> 4.3.0'
gem "binding_of_caller"
Expand Down Expand Up @@ -72,4 +65,3 @@ group :development, :test do
gem 'shoulda-matchers', require: false
gem "debug", "~> 1.11"
end

Loading