diff --git a/Gemfile b/Gemfile index e1af27a523c..585ff28b490 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '>= 3.2.0', '< 3.5.0' gem 'propshaft' gem 'puma', '~> 6.3' -gem 'rails', github: 'rails/rails' +gem 'rails', '8.1.0.beta1' gem 'thor', '~> 1.2' gem 'dotenv' diff --git a/Gemfile.lock b/Gemfile.lock index 2c391febe96..dec814b2a01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,11 @@ GIT hkdf (~> 0.2) jwt (~> 2.0) -GIT - remote: https://github.com/rails/rails.git - revision: 80827ca7ff33ca3026f2c74fe8249ccc6f513318 +GEM + remote: https://rubygems.org/ specs: + action_text-trix (2.1.15) + railties actioncable (8.1.0.beta1) actionpack (= 8.1.0.beta1) activesupport (= 8.1.0.beta1) @@ -63,6 +64,11 @@ GIT erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + active_model_serializers (0.10.15) + actionpack (>= 4.1) + activemodel (>= 4.1) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.3) activejob (8.1.0.beta1) activesupport (= 8.1.0.beta1) globalid (>= 0.3.6) @@ -91,40 +97,6 @@ GIT securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - rails (8.1.0.beta1) - actioncable (= 8.1.0.beta1) - actionmailbox (= 8.1.0.beta1) - actionmailer (= 8.1.0.beta1) - actionpack (= 8.1.0.beta1) - actiontext (= 8.1.0.beta1) - actionview (= 8.1.0.beta1) - activejob (= 8.1.0.beta1) - activemodel (= 8.1.0.beta1) - activerecord (= 8.1.0.beta1) - activestorage (= 8.1.0.beta1) - activesupport (= 8.1.0.beta1) - bundler (>= 1.15.0) - railties (= 8.1.0.beta1) - railties (8.1.0.beta1) - actionpack (= 8.1.0.beta1) - activesupport (= 8.1.0.beta1) - irb (~> 1.13) - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - tsort (>= 0.2) - zeitwerk (~> 2.6) - -GEM - remote: https://rubygems.org/ - specs: - action_text-trix (2.1.15) - railties - active_model_serializers (0.10.15) - actionpack (>= 4.1) - activemodel (>= 4.1) - case_transform (>= 0.2) - jsonapi-renderer (>= 0.1.1.beta1, < 0.3) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) @@ -706,6 +678,20 @@ GEM rack (>= 1.3) rackup (2.2.1) rack (>= 3) + rails (8.1.0.beta1) + actioncable (= 8.1.0.beta1) + actionmailbox (= 8.1.0.beta1) + actionmailer (= 8.1.0.beta1) + actionpack (= 8.1.0.beta1) + actiontext (= 8.1.0.beta1) + actionview (= 8.1.0.beta1) + activejob (= 8.1.0.beta1) + activemodel (= 8.1.0.beta1) + activerecord (= 8.1.0.beta1) + activestorage (= 8.1.0.beta1) + activesupport (= 8.1.0.beta1) + bundler (>= 1.15.0) + railties (= 8.1.0.beta1) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -716,6 +702,15 @@ GEM rails-i18n (8.0.2) i18n (>= 0.7, < 2) railties (>= 8.0.0, < 9) + railties (8.1.0.beta1) + actionpack (= 8.1.0.beta1) + activesupport (= 8.1.0.beta1) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.3.0) rdf (3.3.4) @@ -1070,7 +1065,7 @@ DEPENDENCIES rack-attack (~> 6.6) rack-cors rack-test (~> 2.1) - rails! + rails (= 8.1.0.beta1) rails-i18n (~> 8.0) rdf-normalize (~> 0.5) redcarpet (~> 3.6)