diff --git a/Gemfile b/Gemfile index fad52ff3..c09869f4 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.2.0" # Use main development branch of Rails -gem "rails", github: "rails/rails", branch: "main" +gem "rails", "~> 7.1.0.beta1" # The modern asset pipeline for Rails [https://github.com/rails/propshaft] gem "propshaft" diff --git a/Gemfile.lock b/Gemfile.lock index 130b1bd9..cdd051b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,72 +1,70 @@ -GIT - remote: https://github.com/rails/rails.git - revision: 0debdcf8dc967fce8af66120be435240529655b9 - branch: main +GEM + remote: https://rubygems.org/ specs: - actioncable (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actioncable (7.1.0.beta1) + actionpack (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activestorage (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionmailbox (7.1.0.beta1) + actionpack (= 7.1.0.beta1) + activejob (= 7.1.0.beta1) + activerecord (= 7.1.0.beta1) + activestorage (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - actionview (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionmailer (7.1.0.beta1) + actionpack (= 7.1.0.beta1) + actionview (= 7.1.0.beta1) + activejob (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.0.alpha) - actionview (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionpack (7.1.0.beta1) + actionview (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activestorage (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actiontext (7.1.0.beta1) + actionpack (= 7.1.0.beta1) + activerecord (= 7.1.0.beta1) + activestorage (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionview (7.1.0.beta1) + activesupport (= 7.1.0.beta1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.0.alpha) - activesupport (= 7.1.0.alpha) + activejob (7.1.0.beta1) + activesupport (= 7.1.0.beta1) globalid (>= 0.3.6) - activemodel (7.1.0.alpha) - activesupport (= 7.1.0.alpha) - activerecord (7.1.0.alpha) - activemodel (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + activemodel (7.1.0.beta1) + activesupport (= 7.1.0.beta1) + activerecord (7.1.0.beta1) + activemodel (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) timeout (>= 0.4.0) - activestorage (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + activestorage (7.1.0.beta1) + actionpack (= 7.1.0.beta1) + activejob (= 7.1.0.beta1) + activerecord (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) marcel (~> 1.0) - activesupport (7.1.0.alpha) + activesupport (7.1.0.beta1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -76,32 +74,6 @@ GIT minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - rails (7.1.0.alpha) - actioncable (= 7.1.0.alpha) - actionmailbox (= 7.1.0.alpha) - actionmailer (= 7.1.0.alpha) - actionpack (= 7.1.0.alpha) - actiontext (= 7.1.0.alpha) - actionview (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activemodel (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activestorage (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) - bundler (>= 1.15.0) - railties (= 7.1.0.alpha) - railties (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) - irb - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) - -GEM - remote: https://rubygems.org/ - specs: addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) ahoy_matey (4.2.1) @@ -273,6 +245,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) + rails (7.1.0.beta1) + actioncable (= 7.1.0.beta1) + actionmailbox (= 7.1.0.beta1) + actionmailer (= 7.1.0.beta1) + actionpack (= 7.1.0.beta1) + actiontext (= 7.1.0.beta1) + actionview (= 7.1.0.beta1) + activejob (= 7.1.0.beta1) + activemodel (= 7.1.0.beta1) + activerecord (= 7.1.0.beta1) + activestorage (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) + bundler (>= 1.15.0) + railties (= 7.1.0.beta1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -284,6 +270,14 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) + railties (7.1.0.beta1) + actionpack (= 7.1.0.beta1) + activesupport (= 7.1.0.beta1) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.0.6) rdoc (6.5.0) @@ -420,7 +414,7 @@ DEPENDENCIES propshaft puma (>= 5.0) rack-mini-profiler - rails! + rails (~> 7.1.0.beta1) rails-controller-testing ruby-lsp ruby-lsp-rails