diff --git a/.gitignore b/.gitignore index 6a502e9..cfcc6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp + +# Keep working tree clean when switching branches +/public/packs +/public/packs-test diff --git a/.ruby-version b/.ruby-version index 860487c..5ae69bd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.1 +3.2.5 diff --git a/Gemfile b/Gemfile index 074036a..661941e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '7.0.0.rc1' +gem 'rails', '7.0.8.4' # Use edge Sprockets-rails for testing #gem 'sprockets-rails', github: 'rails/sprockets-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 4181b19..f647958 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,133 +1,155 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activestorage (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) - actionmailer (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - actionview (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + net-imap + net-pop + net-smtp + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.0.rc1) - actionview (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activestorage (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.0.rc1) - activesupport (= 7.0.0.rc1) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (7.0.0.rc1) - activesupport (= 7.0.0.rc1) - activerecord (7.0.0.rc1) - activemodel (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) - activestorage (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.0.rc1) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - builder (3.2.4) + builder (3.3.0) coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.3.4) crass (1.0.6) - erubi (1.10.0) - execjs (2.8.1) - ffi (1.15.4) - globalid (1.0.0) - activesupport (>= 5.0) - i18n (1.8.11) + date (3.3.4) + erubi (1.13.0) + execjs (2.9.1) + ffi (1.17.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - inline_svg (1.7.2) + inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) - jbuilder (2.11.3) + jbuilder (2.12.0) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.4.0) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - loofah (2.13.0) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.6.1) - minitest (5.14.4) - nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + net-imap + net-pop + net-smtp + marcel (1.0.4) + method_source (1.1.0) + mini_mime (1.1.5) + mini_portile2 (2.8.7) + minitest (5.25.1) + net-imap (0.4.14) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.0) + net-protocol + nio4r (2.7.3) + nokogiri (1.16.7) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (7.0.0.rc1) - actioncable (= 7.0.0.rc1) - actionmailbox (= 7.0.0.rc1) - actionmailer (= 7.0.0.rc1) - actionpack (= 7.0.0.rc1) - actiontext (= 7.0.0.rc1) - actionview (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activemodel (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activestorage (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + racc (1.8.1) + rack (2.2.9) + rack-test (2.1.0) + rack (>= 1.3) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.0.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.0.8.4) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rake (13.0.6) + rake (13.2.1) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -136,26 +158,27 @@ GEM sprockets (> 3.0) sprockets-rails tilt - sprockets (4.0.2) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - thor (1.1.0) - tilt (2.0.10) + thor (1.3.1) + tilt (2.4.0) + timeout (0.4.1) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.5.1) + zeitwerk (2.6.17) PLATFORMS ruby @@ -165,10 +188,10 @@ DEPENDENCIES jbuilder jquery-rails pry - rails (= 7.0.0.rc1) + rails (= 7.0.8.4) sassc-rails turbolinks uglifier BUNDLED WITH - 2.1.4 + 2.5.17