Skip to content

Commit

Permalink
Merge pull request #95 from maglevhq/support-for-rails-8
Browse files Browse the repository at this point in the history
Support for rails 8
  • Loading branch information
did authored Nov 22, 2024
2 parents d446396 + dada20a commit e267395
Show file tree
Hide file tree
Showing 127 changed files with 2,909 additions and 576 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
node: [20]
gemfile: ["Gemfile.rails_6", "Gemfile.rails_7_0", "Gemfile"]
gemfile: ["Gemfile.rails_6", "Gemfile.rails_7_0", "Gemfile.rails_7_2", "Gemfile"]

steps:
- name: Checkout code
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ spec/dummy/log/*.log
spec/dummy/storage/
spec/dummy/tmp/
spec/dummy/public/*theme*
spec/legacy_dummy/db/*.sqlite3
spec/legacy_dummy/db/*.sqlite3-journal
spec/legacy_dummy/db/*.sqlite3-*
spec/legacy_dummy/log/*.log
spec/legacy_dummy/storage/
spec/legacy_dummy/tmp/
spec/legacy_dummy/public/*theme*
.DS_Store
tmp/
node_modules/
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Documentation:
Enabled: false

AllCops:
TargetRubyVersion: 2.6
TargetRubyVersion: 3.0
Exclude:
- 'bin/*'
- 'coverage/**/*'
Expand Down
13 changes: 3 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# development dependencies will be added by default to the :development group.
gemspec

gem 'rails', '~> 7.2.1'
gem 'rails', '~> 8.0.0'

# Use Active Storage variant
gem 'image_processing', '~> 1.12.2'

# Use Sprockets to deal with assets in the dummy app
gem 'sprockets-rails'

# Rack vulnerable to ReDoS in content type parsing
gem 'rack', '~> 3.0.10'

# REXML contains a denial of service vulnerability
gem 'rexml', '>= 3.3.6'
# Use Propshaft to deal with assets in the dummy app
gem 'propshaft'

# Temporary use this branch because it solves a bug
# gem 'maglev-injectable', path: '../injectable'
Expand All @@ -34,7 +28,6 @@ gem 'rexml', '>= 3.3.6'
# gem 'byebug', group: [:development, :test]

group :development, :test do
# Use SCSS for stylesheets
gem 'bcrypt'

gem 'factory_bot_rails', '~> 6.2.0'
Expand Down
153 changes: 76 additions & 77 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,74 +5,74 @@ PATH
jbuilder (~> 2.12.0)
kaminari (~> 1.2.1)
maglev-injectable (~> 2.1.1)
rails (>= 6, < 7.3)
rails (>= 6, < 9)
vite_rails (>= 3, < 4)
vite_ruby (>= 3.5)

GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
actioncable (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
actionmailbox (8.0.0)
actionpack (= 8.0.0)
activejob (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
mail (>= 2.8.0)
actionmailer (7.2.1)
actionpack (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activesupport (= 7.2.1)
actionmailer (8.0.0)
actionpack (= 8.0.0)
actionview (= 8.0.0)
activejob (= 8.0.0)
activesupport (= 8.0.0)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.1)
actionview (= 7.2.1)
activesupport (= 7.2.1)
actionpack (8.0.0)
actionview (= 8.0.0)
activesupport (= 8.0.0)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.1)
actionpack (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
actiontext (8.0.0)
actionpack (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.1)
activesupport (= 7.2.1)
actionview (8.0.0)
activesupport (= 8.0.0)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.1)
activesupport (= 7.2.1)
activejob (8.0.0)
activesupport (= 8.0.0)
globalid (>= 0.3.6)
activemodel (7.2.1)
activesupport (= 7.2.1)
activerecord (7.2.1)
activemodel (= 7.2.1)
activesupport (= 7.2.1)
activemodel (8.0.0)
activesupport (= 8.0.0)
activerecord (8.0.0)
activemodel (= 8.0.0)
activesupport (= 8.0.0)
timeout (>= 0.4.0)
activestorage (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activesupport (= 7.2.1)
activestorage (8.0.0)
actionpack (= 8.0.0)
activejob (= 8.0.0)
activerecord (= 8.0.0)
activesupport (= 8.0.0)
marcel (~> 1.0)
activesupport (7.2.1)
activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
Expand All @@ -82,18 +82,20 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
uri (>= 0.13.1)
annotate (2.6.5)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.20)
benchmark (0.4.0)
bigdecimal (3.1.8)
builder (3.3.0)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.4)
date (3.4.0)
diff-lcs (1.5.1)
docile (1.4.0)
drb (2.2.1)
Expand Down Expand Up @@ -151,7 +153,7 @@ GEM
mini_magick (4.13.1)
mini_mime (1.1.5)
minitest (5.24.1)
net-imap (0.4.14)
net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -160,7 +162,7 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nio4r (2.7.4)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
Expand All @@ -169,7 +171,12 @@ GEM
parser (3.3.3.0)
ast (~> 2.4.1)
racc
pg (1.5.6)
pg (1.5.9)
propshaft (1.1.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
psych (5.1.2)
stringio
racc (1.8.0)
Expand All @@ -183,30 +190,30 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.2.1)
actioncable (= 7.2.1)
actionmailbox (= 7.2.1)
actionmailer (= 7.2.1)
actionpack (= 7.2.1)
actiontext (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activemodel (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
rails (8.0.0)
actioncable (= 8.0.0)
actionmailbox (= 8.0.0)
actionmailer (= 8.0.0)
actionpack (= 8.0.0)
actiontext (= 8.0.0)
actionview (= 8.0.0)
activejob (= 8.0.0)
activemodel (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
bundler (>= 1.15.0)
railties (= 7.2.1)
railties (= 8.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
railties (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -286,23 +293,17 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.1)
strscan (3.1.0)
thor (1.3.1)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (1.0.2)
useragent (0.16.10)
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_rails (3.0.19)
railties (>= 5.1, < 9)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.8.2)
dry-cli (>= 0.7, < 2)
Expand All @@ -326,17 +327,15 @@ DEPENDENCIES
image_processing (~> 1.12.2)
maglevcms!
nokogiri (>= 1.15.6)
pg (~> 1.5.6)
rack (~> 3.0.10)
rails (~> 7.2.1)
pg (~> 1.5.9)
propshaft
rails (~> 8.0.0)
rdoc (>= 6.6.3.1)
rexml (>= 3.3.6)
rspec-rails
rubocop
rubocop-rails_config
rubocop-rspec
simplecov
sprockets-rails

BUNDLED WITH
2.4.22
6 changes: 3 additions & 3 deletions Gemfile.rails_6.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PATH
jbuilder (~> 2.12.0)
kaminari (~> 1.2.1)
maglev-injectable (~> 2.1.1)
rails (>= 6, < 7.3)
rails (>= 6, < 9)
vite_rails (>= 3, < 4)
vite_ruby (>= 3.5)

Expand Down Expand Up @@ -160,7 +160,7 @@ GEM
parser (3.3.5.0)
ast (~> 2.4.1)
racc
pg (1.5.8)
pg (1.5.9)
racc (1.8.1)
rack (2.2.9)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -302,7 +302,7 @@ DEPENDENCIES
maglevcms!
mini_magick (~> 4.11)
nokogiri (>= 1.13.10)
pg (~> 1.5.6)
pg (~> 1.5.9)
rails (~> 6.1)
rspec-rails
rubocop
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.rails_7_0.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PATH
jbuilder (~> 2.12.0)
kaminari (~> 1.2.1)
maglev-injectable (~> 2.1.1)
rails (>= 6, < 7.3)
rails (>= 6, < 9)
vite_rails (>= 3, < 4)
vite_ruby (>= 3.5)

Expand Down Expand Up @@ -166,7 +166,7 @@ GEM
parser (3.3.5.0)
ast (~> 2.4.1)
racc
pg (1.5.8)
pg (1.5.9)
racc (1.8.1)
rack (2.2.9)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -308,7 +308,7 @@ DEPENDENCIES
maglevcms!
mini_magick (~> 4.11)
nokogiri (>= 1.13.10)
pg (~> 1.5.6)
pg (~> 1.5.9)
rails (= 7.0.8)
rspec-rails
rubocop
Expand Down
Loading

0 comments on commit e267395

Please sign in to comment.