Skip to content

Dual boot 7.0 and 7.1 #103

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Dual boot 7.0 and 7.1 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0e925f
Dual boot 7.0 and 7.1
arielj Oct 26, 2023
fc6ad66
Don't eager load on CI
arielj Oct 26, 2023
7bfa366
Fix standardrb offenses
arielj Oct 26, 2023
6dccb35
Merge branch 'main' into upgrade-to-rails-7-0
etagwerker Nov 13, 2025
cf4f829
Had to update Puma to v6 to support Rack 3
etagwerker Nov 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
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ ruby "3.1.3"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
if next?
gem "rails", "~> 7.0.0"
gem "rails", "~> 7.1.0"
else
gem "rails", "~> 6.1.0"
gem "rails", "~> 7.0.0"
end

gem "madmin"

# Use postgresql as the database for Active Record
gem "pg", ">= 0.18", "< 2.0"
# Use Puma as the app server
gem "puma", "~> 5.6"
gem "puma", "~> 6.0"
# Use SCSS for stylesheets
gem "sass-rails"
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Expand Down
Loading
Loading