From fe4a036e7ef394115b8e21d2d992d7c95e5b1891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Apr 2024 10:36:37 +0800 Subject: [PATCH 1/5] chore(deps): bump rack from 2.2.8 to 2.2.9 (#1700) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.9. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v2.2.9) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dce1d2ae7..b3fd3cc2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -343,7 +343,7 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.6.2) - rack (2.2.8) + rack (2.2.9) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cache (1.13.0) From a73648e9cce3d866145c1742cb5c95744379e2d0 Mon Sep 17 00:00:00 2001 From: Miles Zhang Date: Sun, 28 Apr 2024 10:50:24 +0800 Subject: [PATCH 2/5] chore: upgrade puma gem and remove nokogiri gem (#1819) Signed-off-by: Miles Zhang --- Gemfile | 4 ---- Gemfile.lock | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index f30cf09bc..434a09bed 100644 --- a/Gemfile +++ b/Gemfile @@ -64,8 +64,6 @@ gem "ruby-progressbar", require: false gem "with_advisory_lock" -gem "nokogiri", ">= 1.11.0.rc4" - gem "newrelic_rpm" gem "sentry-rails" gem "sentry-ruby" @@ -73,8 +71,6 @@ gem "sentry-sidekiq" gem "bigdecimal" -gem "nio4r", "> 2.5.8" - # Deployment gem "rack-attack" diff --git a/Gemfile.lock b/Gemfile.lock index b3fd3cc2f..235249f9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (5.0.0) - puma (6.0.0) + puma (6.4.2) nio4r (~> 2.0) raabro (1.4.0) racc (1.6.2) @@ -514,8 +514,6 @@ DEPENDENCIES net-pop net-smtp newrelic_rpm - nio4r (> 2.5.8) - nokogiri (>= 1.11.0.rc4) pagy pg (>= 0.18, < 2.0) pry From 4f8212af93617ce3dc9abeb791206308a91adbb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Apr 2024 11:16:00 +0800 Subject: [PATCH 3/5] chore(deps): bump nokogiri from 1.14.3 to 1.16.4 (#1820) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.3 to 1.16.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.14.3...v1.16.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 235249f9c..6f7df3791 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.1) + mini_portile2 (2.8.6) minitest (5.17.0) minitest-reporters (1.5.0) ansi @@ -303,12 +303,12 @@ GEM net-protocol newrelic_rpm (8.12.0) nio4r (2.7.1) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nokogiri (1.16.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.14.3-arm64-darwin) + nokogiri (1.16.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.14.3-x86_64-linux) + nokogiri (1.16.4-x86_64-linux) racc (~> 1.4) pagy (5.10.1) activesupport @@ -342,7 +342,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) raabro (1.4.0) - racc (1.6.2) + racc (1.7.3) rack (2.2.9) rack-attack (6.6.1) rack (>= 1.0, < 3) From 7a3d9ceb8d3e42f458020a9362439e82189edd47 Mon Sep 17 00:00:00 2001 From: Miles Zhang Date: Sun, 28 Apr 2024 13:25:45 +0800 Subject: [PATCH 4/5] chore: upgarde rails to 7.0.8.1 (#1821) Signed-off-by: Miles Zhang --- Gemfile.lock | 169 +++++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 81 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6f7df3791..8d254427d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,47 +10,47 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actionmailbox (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.0.8.1) + actionpack (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) + 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.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actiontext (7.0.8.1) + actionpack (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -58,24 +58,24 @@ GEM active_interaction (5.3.0) activemodel (>= 5.2, < 8) activesupport (>= 5.2, < 8) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) + activemodel (7.0.8.1) + activesupport (= 7.0.8.1) + activerecord (7.0.8.1) + activemodel (= 7.0.8.1) + activesupport (= 7.0.8.1) activerecord-import (1.4.1) activerecord (>= 4.2) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) + activestorage (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activesupport (= 7.0.8.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -138,7 +138,7 @@ GEM builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) config (4.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) @@ -156,6 +156,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) + date (3.3.4) deep_merge (1.2.2) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) @@ -201,7 +202,7 @@ GEM ecdsa (1.2.0) ecdsa_ext (0.5.1) ecdsa (~> 1.2.0) - erubi (1.11.0) + erubi (1.12.0) et-orbi (1.2.7) tzinfo eventmachine (1.2.7) @@ -226,8 +227,8 @@ GEM fugit (1.8.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) hashdiff (1.0.1) hiredis (0.6.3) hiredis-client (0.14.1) @@ -240,7 +241,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.4) concurrent-ruby (~> 1.0) iniparse (1.5.0) io-event (1.1.6) @@ -272,34 +273,38 @@ GEM llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.1) + 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) + net-imap + net-pop + net-smtp + marcel (1.0.4) + method_source (1.1.0) + mini_mime (1.1.5) mini_portile2 (2.8.6) - minitest (5.17.0) + minitest (5.22.3) minitest-reporters (1.5.0) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (2.0.2) + mocha (2.2.0) ruby2_keywords (>= 0.0.5) msgpack (1.6.0) murmurhash3 (0.1.7) net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.3.1) + net-imap (0.4.10) + date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.1.3) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.0) net-protocol newrelic_rpm (8.12.0) nio4r (2.7.1) @@ -350,36 +355,38 @@ GEM rack (>= 0.4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + rails (7.0.8.1) + actioncable (= 7.0.8.1) + actionmailbox (= 7.0.8.1) + actionmailer (= 7.0.8.1) + actionpack (= 7.0.8.1) + actiontext (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activemodel (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) bundler (>= 1.15.0) - railties (= 7.0.4) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.0.8.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -451,11 +458,11 @@ GEM spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) spring (>= 4) - thor (1.2.1) - timeout (0.3.0) + thor (1.3.1) + timeout (0.4.1) timers (4.3.5) traces (0.8.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext @@ -466,12 +473,12 @@ 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) with_advisory_lock (4.6.0) activerecord (>= 4.2) - zeitwerk (2.6.6) + zeitwerk (2.6.13) PLATFORMS arm64-darwin-21 From ea88f5fd0e7ee6dd7ba60dc9517de7fca2e8a807 Mon Sep 17 00:00:00 2001 From: Miles Zhang Date: Sun, 28 Apr 2024 19:00:10 +0800 Subject: [PATCH 5/5] chore: upgrade minitest-reporters gem (#1822) Signed-off-by: Miles Zhang --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8d254427d..74932f1b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,7 +286,7 @@ GEM mini_mime (1.1.5) mini_portile2 (2.8.6) minitest (5.22.3) - minitest-reporters (1.5.0) + minitest-reporters (1.6.1) ansi builder minitest (>= 5.0)