diff --git a/Gemfile b/Gemfile index de9bc45f320..40433667da4 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby '>= 3.1.0' gem 'propshaft' gem 'puma', '~> 6.3' gem 'rack', '~> 2.2.7' -gem 'rails', '~> 7.1.1' +gem 'rails', '7.2.0.beta3' gem 'thor', '~> 1.2' gem 'dotenv' @@ -63,6 +63,7 @@ gem 'kaminari', '~> 1.2' gem 'link_header', '~> 0.0' gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar' +gem 'mutex_m' gem 'nokogiri', '~> 1.15' gem 'nsa' gem 'oj', '~> 3.14' @@ -141,7 +142,7 @@ group :test do gem 'selenium-webdriver' # Used to reset the database between system tests - gem 'database_cleaner-active_record' + gem 'database_cleaner-active_record', github: 'DatabaseCleaner/database_cleaner-active_record' # TODO: Release version? # Used to mock environment variables gem 'climate_control' diff --git a/Gemfile.lock b/Gemfile.lock index ba8673bbf8d..5ad578c993a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,38 +7,40 @@ GIT hkdf (~> 0.2) jwt (~> 2.0) +GIT + remote: https://github.com/DatabaseCleaner/database_cleaner-active_record.git + revision: 79b08760d66369f43c40c49cc845a68ea9727e6e + specs: + database_cleaner-active_record (2.1.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.3.4) - actionpack (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activesupport (= 7.1.3.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + activejob (= 7.2.0.beta3) + activerecord (= 7.2.0.beta3) + activestorage (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) + mail (>= 2.8.0) + actionmailer (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + actionview (= 7.2.0.beta3) + activejob (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.2.0.beta3) + actionview (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -46,15 +48,16 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.4) - actionpack (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + useragent (~> 0.16) + actiontext (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + activerecord (= 7.2.0.beta3) + activestorage (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.2.0.beta3) + activesupport (= 7.2.0.beta3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -64,31 +67,31 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.1.3.4) - activesupport (= 7.1.3.4) + activejob (7.2.0.beta3) + activesupport (= 7.2.0.beta3) globalid (>= 0.3.6) - activemodel (7.1.3.4) - activesupport (= 7.1.3.4) - activerecord (7.1.3.4) - activemodel (= 7.1.3.4) - activesupport (= 7.1.3.4) + activemodel (7.2.0.beta3) + activesupport (= 7.2.0.beta3) + activerecord (7.2.0.beta3) + activemodel (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) timeout (>= 0.4.0) - activestorage (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activesupport (= 7.1.3.4) + activestorage (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + activejob (= 7.2.0.beta3) + activerecord (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.2.0.beta3) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) @@ -180,9 +183,6 @@ GEM css_parser (1.17.1) addressable csv (3.3.0) - database_cleaner-active_record (2.2.0) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.3.4) debug (1.9.2) @@ -638,20 +638,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.4) - actioncable (= 7.1.3.4) - actionmailbox (= 7.1.3.4) - actionmailer (= 7.1.3.4) - actionpack (= 7.1.3.4) - actiontext (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activemodel (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + rails (7.2.0.beta3) + actioncable (= 7.2.0.beta3) + actionmailbox (= 7.2.0.beta3) + actionmailer (= 7.2.0.beta3) + actionpack (= 7.2.0.beta3) + actiontext (= 7.2.0.beta3) + actionview (= 7.2.0.beta3) + activejob (= 7.2.0.beta3) + activemodel (= 7.2.0.beta3) + activerecord (= 7.2.0.beta3) + activestorage (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.2.0.beta3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -666,10 +666,10 @@ GEM rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) - irb + railties (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -866,6 +866,7 @@ GEM unf_ext (0.0.9.1) unicode-display_width (2.5.0) uri (0.13.0) + useragent (0.16.10) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) @@ -930,7 +931,7 @@ DEPENDENCIES concurrent-ruby connection_pool csv (~> 3.2) - database_cleaner-active_record + database_cleaner-active_record! debug (~> 1.8) devise (~> 4.9) devise-two-factor @@ -975,6 +976,7 @@ DEPENDENCIES md-paperclip-azure (~> 2.2) memory_profiler mime-types (~> 3.5.0) + mutex_m net-http (~> 0.4.0) net-ldap (~> 0.18) nokogiri (~> 1.15) @@ -1014,7 +1016,7 @@ DEPENDENCIES rack-attack (~> 6.6) rack-cors (~> 2.0) rack-test (~> 2.1) - rails (~> 7.1.1) + rails (= 7.2.0.beta3) rails-controller-testing (~> 1.0) rails-i18n (~> 7.0) rdf-normalize (~> 0.5)