diff --git a/Gemfile b/Gemfile index 765b4d7de..84c3755b2 100644 --- a/Gemfile +++ b/Gemfile @@ -43,9 +43,9 @@ gem 'puma', '~> 6.4.3' gem 'pundit', '~> 2.4.0' gem 'rack-cors', '~> 1.0', require: 'rack/cors' if next? - gem 'rails', '~> 6.1' + gem 'rails', '~> 7.0' else - gem 'rails', '~> 6.1' + gem 'rails', '~> 7.0' end gem 'ranked-model', '~> 0.4.8' gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'panoptes-api-version', ref: '5f1ef6c2b2' diff --git a/Gemfile.lock b/Gemfile.lock index 227817122..c84dbb84b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,40 +12,47 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.5) - actionpack (= 6.1.7.5) - activesupport (= 6.1.7.5) + actioncable (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.5) - actionpack (= 6.1.7.5) - activejob (= 6.1.7.5) - activerecord (= 6.1.7.5) - activestorage (= 6.1.7.5) - activesupport (= 6.1.7.5) + actionmailbox (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (>= 2.7.1) - actionmailer (6.1.7.5) - actionpack (= 6.1.7.5) - actionview (= 6.1.7.5) - activejob (= 6.1.7.5) - activesupport (= 6.1.7.5) + net-imap + net-pop + net-smtp + actionmailer (7.0.8.7) + actionpack (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.5) - actionview (= 6.1.7.5) - activesupport (= 6.1.7.5) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.8.7) + actionview (= 7.0.8.7) + activesupport (= 7.0.8.7) + 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 (6.1.7.5) - actionpack (= 6.1.7.5) - activerecord (= 6.1.7.5) - activestorage (= 6.1.7.5) - activesupport (= 6.1.7.5) + actiontext (7.0.8.7) + actionpack (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.5) - activesupport (= 6.1.7.5) + actionview (7.0.8.7) + activesupport (= 7.0.8.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -61,29 +68,28 @@ GEM active_record_extended (3.2.1) activerecord (>= 5.2, < 7.2.0) pg (< 3.0) - activejob (6.1.7.5) - activesupport (= 6.1.7.5) + activejob (7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.3.6) - activemodel (6.1.7.5) - activesupport (= 6.1.7.5) - activerecord (6.1.7.5) - activemodel (= 6.1.7.5) - activesupport (= 6.1.7.5) + activemodel (7.0.8.7) + activesupport (= 7.0.8.7) + activerecord (7.0.8.7) + activemodel (= 7.0.8.7) + activesupport (= 7.0.8.7) activerecord-import (1.4.1) activerecord (>= 4.2) - activestorage (6.1.7.5) - actionpack (= 6.1.7.5) - activejob (= 6.1.7.5) - activerecord (= 6.1.7.5) - activesupport (= 6.1.7.5) + activestorage (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activesupport (= 7.0.8.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.5) + activesupport (7.0.8.7) 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) aggregate (0.2.3) @@ -110,7 +116,7 @@ GEM brpoplpush-redis_script (0.1.3) concurrent-ruby (~> 1.0, >= 1.0.5) redis (>= 1.0, < 6) - builder (3.2.4) + builder (3.3.0) case_transform (0.2) activesupport coderay (1.1.3) @@ -125,7 +131,7 @@ GEM crass (1.0.6) dalli (3.2.5) database_cleaner (1.99.0) - date (3.3.3) + date (3.4.1) deep_cloneable (3.2.0) activerecord (>= 3.1.0, < 8) deprecate (0.0.0) @@ -142,7 +148,7 @@ GEM railties (>= 4.2) doorkeeper-jwt (0.2.1) jwt (~> 1.5.2, >= 1.5.2) - erubi (1.12.0) + erubi (1.13.0) et-orbi (1.2.11) tzinfo factory_bot (6.2.1) @@ -196,8 +202,8 @@ GEM fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) graphiql-rails (1.9.0) railties sprockets-rails @@ -260,7 +266,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.21.3) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) lumberjack (1.2.8) @@ -269,16 +275,16 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) - method_source (1.0.0) + marcel (1.0.4) + method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - mini_mime (1.1.2) - mini_portile2 (2.8.4) + mini_mime (1.1.5) + mini_portile2 (2.8.8) mini_racer (0.6.3) libv8-node (~> 16.10.0.0) - minitest (5.25.1) + minitest (5.25.4) mock_redis (0.36.0) ruby2_keywords multi_json (1.15.0) @@ -287,19 +293,19 @@ GEM nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-imap (0.3.4) + net-imap (0.5.1) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.0) net-protocol netrc (0.11.0) newrelic_rpm (9.3.1) - nio4r (2.7.3) - nokogiri (1.15.3) + nio4r (2.7.4) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -347,44 +353,44 @@ GEM pundit (2.4.0) activesupport (>= 3.0.0) raabro (1.4.0) - racc (1.7.1) - rack (2.2.8.1) + racc (1.8.1) + rack (2.2.10) rack-cors (1.1.1) rack (>= 2.0.0) rack-protection (3.0.5) rack rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.5) - actioncable (= 6.1.7.5) - actionmailbox (= 6.1.7.5) - actionmailer (= 6.1.7.5) - actionpack (= 6.1.7.5) - actiontext (= 6.1.7.5) - actionview (= 6.1.7.5) - activejob (= 6.1.7.5) - activemodel (= 6.1.7.5) - activerecord (= 6.1.7.5) - activestorage (= 6.1.7.5) - activesupport (= 6.1.7.5) + rails (7.0.8.7) + actioncable (= 7.0.8.7) + actionmailbox (= 7.0.8.7) + actionmailer (= 7.0.8.7) + actionpack (= 7.0.8.7) + actiontext (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activemodel (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) bundler (>= 1.15.0) - railties (= 6.1.7.5) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.1.1) + railties (= 7.0.8.7) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) - railties (6.1.7.5) - actionpack (= 6.1.7.5) - activesupport (= 6.1.7.5) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.0.0) - rake (13.0.6) + rake (13.2.1) ranked-model (0.4.8) activerecord (>= 4.2) rb-fsevent (0.11.2) @@ -478,9 +484,9 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) standby (4.0.0) activerecord (>= 3.0.0) @@ -492,8 +498,8 @@ GEM activesupport colorize (>= 0.8.1) rest-client (>= 2.0.2) - thor (1.3.0) - timeout (0.3.2) + thor (1.3.2) + timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -510,11 +516,11 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) yard (0.9.36) - zeitwerk (2.6.18) + zeitwerk (2.7.1) zoo_stream (1.0.1) aws-sdk @@ -566,7 +572,7 @@ DEPENDENCIES puma (~> 6.4.3) pundit (~> 2.4.0) rack-cors (~> 1.0) - rails (~> 6.1) + rails (~> 7.0) ranked-model (~> 0.4.8) restpack_serializer! rspec