From 596d7e345f319deb7b11a71f253e3099dac5b3fa Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 09:09:28 -0700 Subject: [PATCH 01/24] Upgrading to heroku-22 From 530b059e366ef05423b1530e533fb01c7aa7aa02 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 10:55:36 -0700 Subject: [PATCH 02/24] upgrade to heroku 22 with ruby 3.1 --- .ruby-version | 2 +- Gemfile.lock | 169 +++++++++++++++++++++++++------------------------- bin/setup | 2 +- bin/update | 2 +- 4 files changed, 88 insertions(+), 87 deletions(-) diff --git a/.ruby-version b/.ruby-version index 37c2961c2..fd2a01863 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.1.0 diff --git a/Gemfile.lock b/Gemfile.lock index 661b77233..8e9259f0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -45,30 +45,30 @@ GEM activemodel (>= 4.1, < 6.2) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) marcel (~> 0.3.1) - activesupport (6.0.3.4) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.7.0) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.1.1) activerecord (>= 3.2, < 7.0) @@ -108,8 +108,8 @@ GEM chartkick (3.4.2) childprocess (3.0.0) coderay (1.1.3) - concurrent-ruby (1.1.8) - connection_pool (2.2.3) + concurrent-ruby (1.1.9) + connection_pool (2.2.5) countries (0.9.3) currencies (~> 0.4.2) country_select (1.3.1) @@ -129,7 +129,7 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - draper (4.0.1) + draper (4.0.2) actionpack (>= 5.0) activemodel (>= 5.0) activemodel-serializers-xml (>= 1.0) @@ -138,10 +138,10 @@ GEM em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - erubi (1.10.0) + erubi (1.12.0) erubis (2.7.0) eventmachine (1.2.7) - execjs (2.7.0) + execjs (2.8.1) factory_bot (6.1.0) activesupport (>= 5.0.0) factory_bot_rails (6.1.0) @@ -195,7 +195,7 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) http_parser.rb (0.6.0) - i18n (1.8.9) + i18n (1.12.0) concurrent-ruby (~> 1.0) interception (0.5) jbuilder (2.10.1) @@ -218,7 +218,7 @@ GEM listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.0) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) @@ -238,9 +238,10 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) nenv (0.3.0) - nio4r (2.5.7) - nokogiri (1.11.4) - mini_portile2 (~> 2.5.0) + nio4r (2.5.9) + nokogiri (1.14.3-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -292,29 +293,29 @@ GEM nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) - racc (1.5.2) - rack (2.2.3) + racc (1.6.2) + rack (2.2.6.4) rack-mini-profiler (2.2.0) rack (>= 1.2.0) rack-proxy (0.6.5) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.1.0) + rack (>= 1.3) rack-timeout (0.6.0) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) - bundler (>= 1.3.0) - railties (= 6.0.3.4) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-assets-momentjs (2.22.2) rails-controller-testing (1.0.5) @@ -326,13 +327,13 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (13.0.3) + rake (>= 12.2) + thor (~> 1.0) + rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -344,8 +345,8 @@ GEM tilt redcarpet (3.5.1) redis (4.2.5) - regexp_parser (1.8.2) - request_store (1.5.0) + regexp_parser (2.7.0) + request_store (1.5.1) rack (>= 1.4) responders (3.0.1) actionpack (>= 5.0) @@ -371,7 +372,7 @@ GEM rspec-mocks (~> 3.9) rspec-support (~> 3.9) rspec-support (3.10.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) ruby_http_client (3.5.1) ruby_parser (3.15.0) sexp_processor (~> 4.9) @@ -398,7 +399,7 @@ GEM ruby_http_client (~> 3.4) sexp_processor (4.15.1) shellany (0.0.1) - sidekiq (6.1.2) + sidekiq (6.4.2) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) @@ -417,12 +418,11 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) temple (0.8.2) - thor (1.1.0) - thread_safe (0.3.6) + thor (1.2.1) tilt (2.0.10) timecop (0.9.2) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) underscore-rails (1.8.3) @@ -447,10 +447,11 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.2) + zeitwerk (2.6.7) PLATFORMS - ruby + x86_64-darwin-19 + x86_64-linux DEPENDENCIES actionview-encoded_mail_to @@ -498,7 +499,7 @@ DEPENDENCIES pundit rack-mini-profiler rack-timeout (~> 0.5) - rails (~> 6.0.0) + rails (~> 6.1, >= 6.1.0) rails-assets-momentjs! rails-controller-testing react-rails @@ -521,7 +522,7 @@ DEPENDENCIES webpacker RUBY VERSION - ruby 2.7.2p137 + ruby 3.1.0p0 BUNDLED WITH - 2.2.13 + 2.2.20 diff --git a/bin/setup b/bin/setup index 5853b5ea8..9c1d9107d 100755 --- a/bin/setup +++ b/bin/setup @@ -14,7 +14,7 @@ FileUtils.chdir APP_ROOT do # Add necessary setup steps to this file. puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' + system! "gem install bundler -v '~> 2.3.20'" system('bundle check') || system!('bundle install') # Install JavaScript dependencies diff --git a/bin/update b/bin/update index a8e4462f2..114d4adce 100755 --- a/bin/update +++ b/bin/update @@ -15,7 +15,7 @@ chdir APP_ROOT do # Add necessary update steps to this file. puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' + system! "gem install bundler -v '~> 2.3.20'" system('bundle check') || system!('bundle install') puts "\n== Updating database ==" From 29fc357bf5710e73698827a5e3b6b2167cd899e6 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 11:01:02 -0700 Subject: [PATCH 03/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d883c7634..184615559 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby_version = File.read(".ruby-version").chomp ruby ruby_version gem 'puma' -gem 'rails', '~> 6.0.0' +gem 'rails', '~> 6.1.6' gem 'pg' From d252adfa69f250c90e7ca73b3fc1681a5791bcab Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 11:03:51 -0700 Subject: [PATCH 04/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 184615559..386632b4b 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby_version = File.read(".ruby-version").chomp ruby ruby_version gem 'puma' -gem 'rails', '~> 6.1.6' +gem 'rails', '~> 6.1, >= 6.1.0' gem 'pg' From bd4b0a7f700fc179c5d557444f545d6030983291 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 11:07:11 -0700 Subject: [PATCH 05/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 386632b4b..1c28d8abc 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby_version = File.read(".ruby-version").chomp ruby ruby_version gem 'puma' -gem 'rails', '~> 6.1, >= 6.1.0' +gem 'rails', '~> 6.1', '>= 6.1.0' gem 'pg' From 96e48ec46b06809e957876b2dba5544c8383d0db Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 11:15:14 -0700 Subject: [PATCH 06/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8e9259f0a..587d24a9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) - minitest (~> 5.1) + minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) addressable (2.8.0) @@ -195,7 +195,7 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) http_parser.rb (0.6.0) - i18n (1.12.0) + i18n (>= 0.7, < 2) concurrent-ruby (~> 1.0) interception (0.5) jbuilder (2.10.1) @@ -232,7 +232,7 @@ GEM rake mini_mime (1.0.2) mini_portile2 (2.5.1) - minitest (5.14.4) + minitest (>=5.1) msgpack (1.3.3) multi_json (1.15.0) multi_xml (0.6.0) From dd166e4c627cf5375f8eeb513cda1605da6d06cb Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 14:39:17 -0700 Subject: [PATCH 07/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 587d24a9b..9843c4fad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM marcel (~> 0.3.1) activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) + i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) @@ -195,7 +195,7 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) http_parser.rb (0.6.0) - i18n (>= 0.7, < 2) + i18n (>= 1.6, < 2) concurrent-ruby (~> 1.0) interception (0.5) jbuilder (2.10.1) From c9e073bedcb8159aefd6f160e7a8ab3cb7797185 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 14:43:49 -0700 Subject: [PATCH 08/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9843c4fad..839ebc8c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -195,7 +195,7 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) http_parser.rb (0.6.0) - i18n (>= 1.6, < 2) + i18n (1.12.0) concurrent-ruby (~> 1.0) interception (0.5) jbuilder (2.10.1) From 0931ef12757c312e6d86905f516cb8db870de6c7 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 14:51:18 -0700 Subject: [PATCH 09/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 839ebc8c7..d2dcb05d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -232,7 +232,7 @@ GEM rake mini_mime (1.0.2) mini_portile2 (2.5.1) - minitest (>=5.1) + minitest (5.10.3) msgpack (1.3.3) multi_json (1.15.0) multi_xml (0.6.0) From b5c650e6e67a2b6dec8a893d6cbb1231f44a32b6 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 15:47:45 -0700 Subject: [PATCH 10/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2dcb05d2..57057a1be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GEM actionpack (6.1.7.3) actionview (= 6.1.7.3) activesupport (= 6.1.7.3) - rack (~> 2.0, >= 2.0.8) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) From 0ca275ce9bd1470cfcc22400ec2380bd269fab1e Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 15:57:40 -0700 Subject: [PATCH 11/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 57057a1be..9ee1113ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,7 @@ GEM specs: actioncable (6.1.7.3) actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) actionmailbox (6.1.7.3) @@ -17,6 +18,7 @@ GEM actionpack (= 6.1.7.3) actionview (= 6.1.7.3) activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) actionpack (6.1.7.3) @@ -61,7 +63,9 @@ GEM actionpack (= 6.1.7.3) activejob (= 6.1.7.3) activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 0.3.1) + mini_mime (>= 1.1.0) activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) From 8a09fd70a671749332038e2083f91c915861b1db Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 16:04:08 -0700 Subject: [PATCH 12/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9ee1113ba..6e0d30dde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM activejob (= 6.1.7.3) activerecord (= 6.1.7.3) activesupport (= 6.1.7.3) - marcel (~> 0.3.1) + marcel (~> 1.0) mini_mime (>= 1.1.0) activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -228,8 +228,7 @@ GEM lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.2) method_source (1.0.0) mimemagic (0.3.10) nokogiri (~> 1) From d87fc3b700ecce44ff1ce1ce3df7c6fccfda053e Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 16:09:50 -0700 Subject: [PATCH 13/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index 6e0d30dde..7aea894f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,6 +139,7 @@ GEM activemodel-serializers-xml (>= 1.0) activesupport (>= 5.0) request_store (>= 1.0) + ruby2_keywords em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) From 0eaad66c343a388b84c79728152d181a99ec39be Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 16:36:26 -0700 Subject: [PATCH 14/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7aea894f2..c301e8e8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -529,4 +529,4 @@ RUBY VERSION ruby 3.1.0p0 BUNDLED WITH - 2.2.20 + 2.3.20 From bde14fc2a4df91bb5812be47895d483a84cd1923 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 16:45:37 -0700 Subject: [PATCH 15/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c301e8e8b..d7afd33a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,8 +160,8 @@ GEM ffi (1.14.2) foreman (0.87.2) formatador (0.2.5) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (1.1.0) + activesupport (>= 5.0) groupdate (5.2.1) activesupport (>= 5) growl (1.0.3) From cb9361c2e2c1a0ef06e374c55e663362abf54110 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 16:55:47 -0700 Subject: [PATCH 16/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index d7afd33a6..818c5d016 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,6 +229,9 @@ GEM lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) mimemagic (0.3.10) @@ -242,6 +245,16 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) nenv (0.3.0) + net-dns (0.9.0) + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol nio4r (2.5.9) nokogiri (1.14.3-x86_64-darwin) racc (~> 1.4) @@ -490,6 +503,7 @@ DEPENDENCIES jquery-rails jquery-ui-rails launchy + net-dns nokogiri omniauth-github omniauth-google-oauth2 From e9a5cdaba6331ad1d9fb8085722788a9be55292c Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 16:57:38 -0700 Subject: [PATCH 17/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 1c28d8abc..8df08d029 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ gem 'country_select', '~> 1.3' gem 'draper', '~> 4.0' gem 'faker' gem 'groupdate' +gem 'net-dns' gem 'nokogiri' gem 'pundit' gem 'redcarpet', '~> 3.5' From 8ce2fa1e03060ac5ba833eb0f57e8f910eacbf9f Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 17:06:12 -0700 Subject: [PATCH 18/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8df08d029..1c28d8abc 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,6 @@ gem 'country_select', '~> 1.3' gem 'draper', '~> 4.0' gem 'faker' gem 'groupdate' -gem 'net-dns' gem 'nokogiri' gem 'pundit' gem 'redcarpet', '~> 3.5' diff --git a/Gemfile.lock b/Gemfile.lock index 818c5d016..7a91956ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,6 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) nenv (0.3.0) - net-dns (0.9.0) net-imap (0.3.4) date net-protocol @@ -503,7 +502,6 @@ DEPENDENCIES jquery-rails jquery-ui-rails launchy - net-dns nokogiri omniauth-github omniauth-google-oauth2 From aee9aa8ae7cd38ca190f954e31daf4a4a3fd0397 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 17:13:23 -0700 Subject: [PATCH 19/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 7a91956ad..ed473dd1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -502,6 +502,8 @@ DEPENDENCIES jquery-rails jquery-ui-rails launchy + net-protocol + net-imap nokogiri omniauth-github omniauth-google-oauth2 From 7247597b2272804bc46cb7813eeed678ae53f302 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 17:14:24 -0700 Subject: [PATCH 20/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 1c28d8abc..a755423ca 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,8 @@ gem 'country_select', '~> 1.3' gem 'draper', '~> 4.0' gem 'faker' gem 'groupdate' +gem 'net-protocol' +gem 'net-imap' gem 'nokogiri' gem 'pundit' gem 'redcarpet', '~> 3.5' From a3c04ec90183bd506f64e8d6abd0f699b98b86d0 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 23:30:51 -0700 Subject: [PATCH 21/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 3 ++- Gemfile.lock | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a755423ca..b9f94539b 100644 --- a/Gemfile +++ b/Gemfile @@ -46,6 +46,7 @@ gem 'sendgrid-actionmailer' gem 'simple_form' gem 'react-rails' +gem 'regexp_parser', '<= 2.7.0' gem 'webpacker' gem 'sidekiq' @@ -70,7 +71,7 @@ group :development do end group :development, :test do - gem 'capybara', '~> 3.33' + gem 'capybara', '~> 3.34' gem 'database_cleaner', '~> 1.6' gem 'dotenv-rails' gem 'factory_bot_rails' diff --git a/Gemfile.lock b/Gemfile.lock index ed473dd1a..c0e4364bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.0.2) + mini_mime (1.1.2) mini_portile2 (2.5.1) minitest (5.10.3) msgpack (1.3.3) @@ -361,7 +361,6 @@ GEM tilt redcarpet (3.5.1) redis (4.2.5) - regexp_parser (2.7.0) request_store (1.5.1) rack (>= 1.4) responders (3.0.1) @@ -478,7 +477,7 @@ DEPENDENCIES bootsnap bootstrap-multiselect-rails (~> 0.9.9) bootstrap-sass (~> 3.4.1) - capybara (~> 3.33) + capybara (~> 3.34) chartkick coderay (~> 1.0) country_select (~> 1.3) From e3aeb6e8682440d10b88a1999e42e595e5cffdd4 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Thu, 27 Apr 2023 23:34:25 -0700 Subject: [PATCH 22/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index b9f94539b..433acff9a 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,6 @@ gem 'sendgrid-actionmailer' gem 'simple_form' gem 'react-rails' -gem 'regexp_parser', '<= 2.7.0' gem 'webpacker' gem 'sidekiq' From 6f59db8befd921cd51d0560e2af75be7c2d8bf95 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Fri, 28 Apr 2023 00:06:47 -0700 Subject: [PATCH 23/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile | 2 + Gemfile.lock | 351 +++++++++++++++++++++++++++------------------------ 2 files changed, 188 insertions(+), 165 deletions(-) diff --git a/Gemfile b/Gemfile index 433acff9a..42399d30f 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,9 @@ gem 'draper', '~> 4.0' gem 'faker' gem 'groupdate' gem 'net-protocol' +gem 'timeout' gem 'net-imap' +gem 'date' gem 'nokogiri' gem 'pundit' gem 'redcarpet', '~> 3.5' diff --git a/Gemfile.lock b/Gemfile.lock index c0e4364bd..009caf860 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,10 @@ GEM - remote: https://rubygems.org/ remote: https://rails-assets.org/ + specs: + rails-assets-momentjs (2.29.4) + +GEM + remote: https://rubygems.org/ specs: actioncable (6.1.7.3) actionpack (= 6.1.7.3) @@ -42,9 +46,9 @@ GEM rails-html-sanitizer (~> 1.1, >= 1.2.0) actionview-encoded_mail_to (1.0.9) rails - active_model_serializers (0.10.12) - actionpack (>= 4.1, < 6.2) - activemodel (>= 4.1, < 6.2) + active_model_serializers (0.10.13) + actionpack (>= 4.1, < 7.1) + activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) activejob (6.1.7.3) @@ -72,66 +76,67 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - annotate (3.1.1) - activerecord (>= 3.2, < 7.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) - autoprefixer-rails (10.1.0.0) - execjs + autoprefixer-rails (10.4.13.0) + execjs (~> 2) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.16) + bcrypt (3.1.18) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindex (0.8.1) - binding_of_caller (0.8.0) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.5.1) - msgpack (~> 1.0) + bootsnap (1.16.0) + msgpack (~> 1.2) bootstrap-multiselect-rails (0.9.9) rails (>= 4.0.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - capybara (3.34.0) + capybara (3.39.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) case_transform (0.2) activesupport - chartkick (3.4.2) - childprocess (3.0.0) + chartkick (5.0.1) coderay (1.1.3) - concurrent-ruby (1.1.9) - connection_pool (2.2.5) + concurrent-ruby (1.2.2) + connection_pool (2.4.0) countries (0.9.3) currencies (~> 0.4.2) country_select (1.3.1) countries (= 0.9.3) crass (1.0.6) currencies (0.4.2) - database_cleaner (1.8.5) - debug_inspector (0.0.3) - devise (4.7.3) + database_cleaner (1.99.0) + date (3.3.3) + debug_inspector (1.1.0) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + diff-lcs (1.5.0) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) draper (4.0.2) actionpack (>= 5.0) @@ -140,38 +145,39 @@ GEM activesupport (>= 5.0) request_store (>= 1.0) ruby2_keywords - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) erubi (1.12.0) erubis (2.7.0) eventmachine (1.2.7) execjs (2.8.1) - factory_bot (6.1.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.15.1) - i18n (>= 1.6, < 2) - faraday (1.1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - ffi (1.14.2) + faker (3.2.0) + i18n (>= 1.8.11, < 2) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) foreman (0.87.2) - formatador (0.2.5) + formatador (1.1.0) globalid (1.1.0) activesupport (>= 5.0) - groupdate (5.2.1) - activesupport (>= 5) + groupdate (6.2.1) + activesupport (>= 5.2) growl (1.0.3) - guard (2.16.2) + guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) @@ -184,66 +190,62 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.2.1) + haml (5.2.2) temple (>= 0.8.0) tilt - haml-rails (2.0.1) + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) - hashie (4.1.0) - html2haml (2.2.0) + hashie (5.0.0) + html2haml (2.3.0) erubis (~> 2.7.0) - haml (>= 4.0, < 6) + haml (>= 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http_parser.rb (0.6.0) - i18n (1.12.0) + http_parser.rb (0.8.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) interception (0.5) - jbuilder (2.10.1) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.4.0) + jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) jsonapi-renderer (0.2.2) - jwt (2.2.2) - launchy (2.5.0) - addressable (~> 2.7) - listen (3.3.3) + jwt (2.7.0) + launchy (2.5.2) + addressable (~> 2.8) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) + matrix (0.4.2) method_source (1.0.0) - mimemagic (0.3.10) - nokogiri (~> 1) - rake mini_mime (1.1.2) - mini_portile2 (2.5.1) - minitest (5.10.3) - msgpack (1.3.3) + minitest (5.18.0) + msgpack (1.7.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) nenv (0.3.0) net-imap (0.3.4) date @@ -257,43 +259,49 @@ GEM nio4r (2.5.9) nokogiri (1.14.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.14.3-x86_64-linux) - racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oauth (0.5.6) - oauth2 (1.4.4) - faraday (>= 0.8, < 2.0) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.9.1) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + omniauth (2.1.1) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - omniauth-github (1.4.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.0) + rack (>= 2.2.3) + rack-protection + omniauth-github (2.0.1) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.1.1) jwt (>= 2.0) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.6) - omniauth-oauth (1.1.0) + oauth2 (~> 2.0.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) + omniauth-oauth (1.2.0) oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.7.0) - oauth2 (~> 1.4) - omniauth (~> 1.9) + omniauth (>= 1.0, < 3) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) - paper_trail (11.0.0) - activerecord (>= 5.2) - request_store (~> 1.1) - pg (1.2.3) - pry (0.13.1) + paper_trail (14.0.0) + activerecord (>= 6.0) + request_store (~> 1.4) + pg (1.5.2) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.9) @@ -304,20 +312,22 @@ GEM pry-rescue (1.5.2) interception (>= 0.5) pry (>= 0.12.0) - public_suffix (4.0.6) - puma (5.3.1) + public_suffix (5.0.1) + puma (6.2.2) nio4r (~> 2.0) - pundit (2.1.0) + pundit (2.3.0) activesupport (>= 3.0.0) racc (1.6.2) - rack (2.2.6.4) - rack-mini-profiler (2.2.0) + rack (2.2.7) + rack-mini-profiler (3.1.0) rack (>= 1.2.0) - rack-proxy (0.6.5) + rack-protection (3.0.6) + rack + rack-proxy (0.7.6) rack rack-test (2.1.0) rack (>= 1.3) - rack-timeout (0.6.0) + rack-timeout (0.6.3) rails (6.1.7.3) actioncable (= 6.1.7.3) actionmailbox (= 6.1.7.3) @@ -333,7 +343,6 @@ GEM bundler (>= 1.15.0) railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) - rails-assets-momentjs (2.22.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -341,8 +350,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) railties (6.1.7.3) actionpack (= 6.1.7.3) activesupport (= 6.1.7.3) @@ -350,48 +359,51 @@ GEM rake (>= 12.2) thor (~> 1.0) rake (13.0.6) - rb-fsevent (0.10.4) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - react-rails (2.6.1) + react-rails (2.6.2) babel-transpiler (>= 0.7.0) connection_pool execjs railties (>= 3.2) tilt - redcarpet (3.5.1) - redis (4.2.5) + redcarpet (3.6.0) + redis-client (0.14.1) + connection_pool + regexp_parser (2.8.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (4.0.1) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-support (3.10.0) - ruby2_keywords (0.0.4) - ruby_http_client (3.5.1) - ruby_parser (3.15.0) - sexp_processor (~> 4.9) - rubyzip (2.3.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) + rspec-support (3.12.0) + ruby2_keywords (0.0.5) + ruby_http_client (3.5.5) + ruby_parser (3.20.0) + sexp_processor (~> 4.16) + rubyzip (2.3.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -403,61 +415,69 @@ GEM sprockets-rails tilt selectize-rails (0.12.6) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) - semantic_range (2.3.1) - sendgrid-actionmailer (3.1.0) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + semantic_range (3.0.0) + sendgrid-actionmailer (3.2.0) mail (~> 2.7) - sendgrid-ruby (~> 6.0) - sendgrid-ruby (6.3.4) + sendgrid-ruby (~> 6.4) + sendgrid-ruby (6.6.2) ruby_http_client (~> 3.4) - sexp_processor (4.15.1) + sexp_processor (4.16.1) shellany (0.0.1) - sidekiq (6.4.2) - connection_pool (>= 2.2.2) - rack (~> 2.0) - redis (>= 4.2.0) - simple_form (5.0.3) - actionpack (>= 5.0) - activemodel (>= 5.0) + sidekiq (7.0.9) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.11.0) + simple_form (5.2.0) + actionpack (>= 5.2) + activemodel (>= 5.2) slop (3.6.0) - spring (2.1.1) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) + spring (4.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (4.0.2) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - temple (0.8.2) + temple (0.10.0) thor (1.2.1) - tilt (2.0.10) - timecop (0.9.2) + tilt (2.1.0) + timecop (0.9.6) + timeout (0.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) underscore-rails (1.8.3) + version_gem (1.1.2) warden (1.2.9) rack (>= 2.0.9) - web-console (4.1.0) + web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.4.1) + webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) - webpacker (5.2.1) + selenium-webdriver (> 3.141, < 5.0) + webpacker (5.4.4) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.3) + websocket (1.2.9) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -465,8 +485,7 @@ GEM zeitwerk (2.6.7) PLATFORMS - x86_64-darwin-19 - x86_64-linux + x86_64-darwin-22 DEPENDENCIES actionview-encoded_mail_to @@ -482,6 +501,7 @@ DEPENDENCIES coderay (~> 1.0) country_select (~> 1.3) database_cleaner (~> 1.6) + date devise (~> 4.7) dotenv-rails draper (~> 4.0) @@ -501,8 +521,8 @@ DEPENDENCIES jquery-rails jquery-ui-rails launchy - net-protocol net-imap + net-protocol nokogiri omniauth-github omniauth-google-oauth2 @@ -532,6 +552,7 @@ DEPENDENCIES spring spring-commands-rspec timecop + timeout uglifier (>= 1.3.0) underscore-rails web-console @@ -539,7 +560,7 @@ DEPENDENCIES webpacker RUBY VERSION - ruby 3.1.0p0 + ruby 3.1.0p0 BUNDLED WITH 2.3.20 From 045d853682772ed0e3e0b975469a60ae251ed3d1 Mon Sep 17 00:00:00 2001 From: Elize Selvarajah Date: Fri, 28 Apr 2023 00:09:11 -0700 Subject: [PATCH 24/24] upgrade to heroku 22 with ruby 3.1 --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 009caf860..e90aa46c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,6 +259,8 @@ GEM nio4r (2.5.9) nokogiri (1.14.3-x86_64-darwin) racc (~> 1.4) + nokogiri (1.14.3-x86_64-linux) + racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) @@ -486,6 +488,7 @@ GEM PLATFORMS x86_64-darwin-22 + x86_64-linux DEPENDENCIES actionview-encoded_mail_to