diff --git a/Gemfile b/Gemfile index 2e94d7e75..1472ff95f 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.0.2" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' -gem "rails", "~> 6.1.4" +gem "rails", "~> 7.0.0.rc1" # Use postgresql as the database for Active Record gem "pg", "~> 1.1" # Use Puma as the app server @@ -24,7 +24,9 @@ gem "hotwire-rails" # Soft delete ActiveRecords objects gem "discard" # Administration framework -gem "activeadmin" +gem "activeadmin", git: "https://github.com/naveed-ahmad/activeadmin.git", branch: "rails7" +gem "inherited_resources", git: "https://github.com/naveed-ahmad/inherited_resources.git", branch: "rails7" +gem "ransack", github: "activerecord-hackery/ransack" # Admin charts gem "chartkick" # Spreadsheet parsing diff --git a/Gemfile.lock b/Gemfile.lock index cad5c5eb5..b83380ec9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/activerecord-hackery/ransack.git + revision: 25c5c9dfec216a5fafcd90b8893abcfe19460e50 + specs: + ransack (2.4.2) + activerecord (>= 5.2.4) + activesupport (>= 5.2.4) + i18n + GIT remote: https://github.com/ghiculescu/devise.git revision: 3b2d9ae3d47be5c9228c4446119b04b0e98917c1 @@ -10,6 +19,32 @@ GIT responders warden (~> 1.2.3) +GIT + remote: https://github.com/naveed-ahmad/activeadmin.git + revision: b4257759b62a6febed409b993493ef227c3ebbd6 + branch: rails7 + specs: + activeadmin (2.9.0) + arbre (~> 1.2, >= 1.2.1) + formtastic (>= 3.1, < 5.0) + formtastic_i18n (~> 0.4) + inherited_resources (~> 1.7) + jquery-rails (~> 4.2) + kaminari (~> 1.0, >= 1.2.1) + railties (>= 5.2, <= 7.0.0) + ransack (~> 2.1, >= 2.1.1) + +GIT + remote: https://github.com/naveed-ahmad/inherited_resources.git + revision: 15aa6273f97cc34369a080b82e7b9e15c4308c00 + branch: rails7 + specs: + inherited_resources (1.13.0) + actionpack (>= 5.2, <= 7.0.0) + has_scope (~> 0.6) + railties (>= 5.2, <= 7.0.0) + responders (>= 2, < 4) + GIT remote: https://github.com/rspec/rspec-core.git revision: e36aa2a9ebe68acee3ce05190fc2124947b45925 @@ -60,79 +95,69 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) + actioncable (7.0.0.rc1) + actionpack (= 7.0.0.rc1) + activesupport (= 7.0.0.rc1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.1) - actionpack (= 6.1.4.1) - activejob (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.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) mail (>= 2.7.1) - actionmailer (6.1.4.1) - actionpack (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activesupport (= 6.1.4.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) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.1) - actionview (= 6.1.4.1) - activesupport (= 6.1.4.1) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.0.rc1) + actionview (= 7.0.0.rc1) + activesupport (= 7.0.0.rc1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.1) - actionpack (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) + 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) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.4.1) - activesupport (= 6.1.4.1) + actionview (7.0.0.rc1) + activesupport (= 7.0.0.rc1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activeadmin (2.9.0) - arbre (~> 1.2, >= 1.2.1) - formtastic (>= 3.1, < 5.0) - formtastic_i18n (~> 0.4) - inherited_resources (~> 1.7) - jquery-rails (~> 4.2) - kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) - ransack (~> 2.1, >= 2.1.1) - activejob (6.1.4.1) - activesupport (= 6.1.4.1) + activejob (7.0.0.rc1) + activesupport (= 7.0.0.rc1) globalid (>= 0.3.6) - activemodel (6.1.4.1) - activesupport (= 6.1.4.1) - activerecord (6.1.4.1) - activemodel (= 6.1.4.1) - activesupport (= 6.1.4.1) - activestorage (6.1.4.1) - actionpack (= 6.1.4.1) - activejob (= 6.1.4.1) - activerecord (= 6.1.4.1) - activesupport (= 6.1.4.1) - marcel (~> 1.0.0) + 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) + marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.1) + activesupport (7.0.0.rc1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - arbre (1.4.0) - activesupport (>= 3.0.0, < 6.2) - ruby2_keywords (>= 0.0.2, < 1.0) + arbre (1.2.1) + activesupport (>= 3.0.0) ast (2.4.2) bcrypt (3.1.16) bindex (0.8.1) @@ -202,11 +227,6 @@ GEM turbo-rails i18n (1.8.11) concurrent-ruby (~> 1.0) - inherited_resources (1.13.0) - actionpack (>= 5.2, < 6.2) - has_scope (~> 0.6) - railties (>= 5.2, < 6.2) - responders (>= 2, < 4) iniparse (1.5.0) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) @@ -229,7 +249,7 @@ GEM listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -253,7 +273,7 @@ GEM iniparse (~> 1.4) rexml (~> 3.2) parallel (1.21.0) - parser (3.0.3.1) + parser (3.0.3.2) ast (~> 2.4.1) pg (1.2.3) postcodes_io (0.4.0) @@ -275,38 +295,34 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4.1) - actioncable (= 6.1.4.1) - actionmailbox (= 6.1.4.1) - actionmailer (= 6.1.4.1) - actionpack (= 6.1.4.1) - actiontext (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activemodel (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) + 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) bundler (>= 1.15.0) - railties (= 6.1.4.1) - sprockets-rails (>= 2.0.0) + railties (= 7.0.0.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) + railties (7.0.0.rc1) + actionpack (= 7.0.0.rc1) + activesupport (= 7.0.0.rc1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.0.0) rake (13.0.6) - ransack (2.4.2) - activerecord (>= 5.2.4) - activesupport (>= 5.2.4) - i18n rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -369,13 +385,6 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.3) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.1) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) stimulus-rails (0.7.3) rails (>= 6.0.0) thor (1.1.0) @@ -418,7 +427,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - activeadmin + activeadmin! bootsnap (>= 1.4.4) byebug capybara @@ -431,6 +440,7 @@ DEPENDENCIES govuk-components govuk_design_system_formbuilder hotwire-rails + inherited_resources! json-schema listen (~> 3.3) overcommit (>= 0.37.0) @@ -439,7 +449,8 @@ DEPENDENCIES pry-byebug puma (~> 5.0) rack-mini-profiler (~> 2.0) - rails (~> 6.1.4) + rails (~> 7.0.0.rc1) + ransack! roo rspec-core! rspec-expectations!