From 033492f2ab4592432cc59948fcb621b4631b7bb6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:15:40 +0200 Subject: [PATCH 01/49] Bump rails --- Gemfile | 2 +- Gemfile.lock | 139 ++++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 69 deletions(-) diff --git a/Gemfile b/Gemfile index 93930b7e7..ddd519ea6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "6.1.6.1" +gem "rails", "6.1.7.4" # needed for actionmailer, can be removed when upgrading to rails 7 gem "net-imap", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 2c2a72f3c..16b7cf999 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + actioncable (6.1.7.4) + actionpack (= 6.1.7.4) + activesupport (= 6.1.7.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailbox (6.1.7.4) + actionpack (= 6.1.7.4) + activejob (= 6.1.7.4) + activerecord (= 6.1.7.4) + activestorage (= 6.1.7.4) + activesupport (= 6.1.7.4) mail (>= 2.7.1) - actionmailer (6.1.6.1) - actionpack (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailer (6.1.7.4) + actionpack (= 6.1.7.4) + actionview (= 6.1.7.4) + activejob (= 6.1.7.4) + activesupport (= 6.1.7.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.6.1) - actionview (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionpack (6.1.7.4) + actionview (= 6.1.7.4) + activesupport (= 6.1.7.4) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.6.1) - actionpack (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actiontext (6.1.7.4) + actionpack (= 6.1.7.4) + activerecord (= 6.1.7.4) + activestorage (= 6.1.7.4) + activesupport (= 6.1.7.4) nokogiri (>= 1.8.5) - actionview (6.1.6.1) - activesupport (= 6.1.6.1) + actionview (6.1.7.4) + activesupport (= 6.1.7.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -42,24 +42,24 @@ GEM active_model_serializers (0.9.8) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (6.1.6.1) - activesupport (= 6.1.6.1) + activejob (6.1.7.4) + activesupport (= 6.1.7.4) globalid (>= 0.3.6) - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) + activemodel (6.1.7.4) + activesupport (= 6.1.7.4) + activerecord (6.1.7.4) + activemodel (= 6.1.7.4) + activesupport (= 6.1.7.4) activerecord-import (1.4.0) activerecord (>= 4.2) - activestorage (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activesupport (= 6.1.6.1) + activestorage (6.1.7.4) + actionpack (= 6.1.7.4) + activejob (= 6.1.7.4) + activerecord (= 6.1.7.4) + activesupport (= 6.1.7.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.6.1) + activesupport (6.1.7.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -231,7 +231,7 @@ GEM unf (>= 0.0.5, < 1.0.0) encryptor (3.0.0) equalizer (0.0.11) - erubi (1.10.0) + erubi (1.12.0) eslintrb (2.1.0) execjs multi_json (>= 1.3) @@ -320,7 +320,7 @@ GEM gitlab (4.18.0) httparty (~> 0.18) terminal-table (>= 1.5.1) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) gon (6.4.0) actionpack (>= 3.0.20) @@ -410,13 +410,16 @@ GEM multi_json (~> 1.14) logging-rails (0.6.0) logging (>= 1.8) - loofah (2.18.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) macaddr (1.7.2) systemu (~> 2.6.5) - 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) memoizable (0.4.2) @@ -438,7 +441,7 @@ GEM multipart-post (2.2.3) mysql2 (0.5.4) naught (1.1.0) - net-imap (0.3.4) + net-imap (0.3.6) date net-protocol net-pop (0.1.2) @@ -447,7 +450,7 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) + nio4r (2.5.9) nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -532,7 +535,7 @@ GEM puma (5.6.5) nio4r (~> 2.0) raabro (1.4.0) - racc (1.7.0) + racc (1.7.1) rack (2.2.7) rack-cors (1.1.1) rack (>= 2.0.0) @@ -555,20 +558,20 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails (6.1.6.1) - actioncable (= 6.1.6.1) - actionmailbox (= 6.1.6.1) - actionmailer (= 6.1.6.1) - actionpack (= 6.1.6.1) - actiontext (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activemodel (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + rails (6.1.7.4) + actioncable (= 6.1.7.4) + actionmailbox (= 6.1.7.4) + actionmailer (= 6.1.7.4) + actionpack (= 6.1.7.4) + actiontext (= 6.1.7.4) + actionview (= 6.1.7.4) + activejob (= 6.1.7.4) + activemodel (= 6.1.7.4) + activerecord (= 6.1.7.4) + activestorage (= 6.1.7.4) + activesupport (= 6.1.7.4) bundler (>= 1.15.0) - railties (= 6.1.6.1) + railties (= 6.1.7.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -577,17 +580,17 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) rails-timeago (2.20.0) actionpack (>= 5.2) activesupport (>= 5.2) - railties (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + railties (6.1.7.4) + actionpack (= 6.1.7.4) + activesupport (= 6.1.7.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -691,9 +694,9 @@ GEM simplecov_json_formatter (0.1.4) sinon-rails (1.15.0) railties (>= 3.1) - sprockets (4.1.1) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -714,11 +717,11 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.1.10) execjs (>= 0.3.0, < 3) - thor (1.2.1) + thor (1.2.2) thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.5) - timeout (0.3.2) + timeout (0.4.0) timers (4.3.3) toml-rb (2.1.2) citrus (~> 3.0, > 3.0) @@ -861,7 +864,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 6.1.6.1) + rails (= 6.1.7.4) rails-controller-testing (= 1.0.5) rails-i18n (= 6.0.0) rails-timeago (= 2.20.0) From c286123cc1ce7aaf03fa1932ad106cfefc13a534 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:17:30 +0200 Subject: [PATCH 02/49] Bump responders --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ddd519ea6..8aab43e3e 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem "net-smtp", require: false # Legacy Rails features, remove me! # responders (class level) -gem "responders", "3.0.1" +gem "responders", "3.1.0" # Appserver diff --git a/Gemfile.lock b/Gemfile.lock index 16b7cf999..2049baa12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -606,9 +606,9 @@ GEM regexp_parser (2.8.1) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) rexml (3.2.5) rotp (6.2.0) rqrcode (2.1.1) @@ -870,7 +870,7 @@ DEPENDENCIES rails-timeago (= 2.20.0) redcarpet (= 3.5.1) redis (= 4.7.0) - responders (= 3.0.1) + responders (= 3.1.0) rqrcode (= 2.1.1) rspec-json_expectations (~> 2.1) rspec-rails (= 5.1.2) From a784e32840fe9c968a8825d17125b746d80553b1 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:23:10 +0200 Subject: [PATCH 03/49] Bump puma --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8aab43e3e..7a09de88f 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem "responders", "3.1.0" # Appserver -gem "puma", "5.6.5", require: false +gem "puma", "6.3.0", require: false # Federation diff --git a/Gemfile.lock b/Gemfile.lock index 2049baa12..0dc21af47 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -532,7 +532,7 @@ GEM byebug (~> 11.0) pry (~> 0.10) public_suffix (4.0.7) - puma (5.6.5) + puma (6.3.0) nio4r (~> 2.0) raabro (1.4.0) racc (1.7.1) @@ -858,7 +858,7 @@ DEPENDENCIES pronto-scss (= 0.11.0) pry pry-byebug - puma (= 5.6.5) + puma (= 6.3.0) rack-cors (= 1.1.1) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) From ebcbdd823c9bdf21e0e560585964c3966b4e0425 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:23:54 +0200 Subject: [PATCH 04/49] Bump diaspora_federation --- Gemfile | 6 +++--- Gemfile.lock | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 7a09de88f..e40e8d180 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,8 @@ gem "puma", "6.3.0", require: false # Federation -gem "diaspora_federation-json_schema", "1.0.1" -gem "diaspora_federation-rails", "1.0.1" +gem "diaspora_federation-json_schema", "1.1.0" +gem "diaspora_federation-rails", "1.1.0" # API and JSON @@ -241,7 +241,7 @@ group :test do gem "timecop", "0.9.5" gem "webmock", "3.14.0", require: false - gem "diaspora_federation-test", "1.0.1" + gem "diaspora_federation-test", "1.1.0" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 0dc21af47..2ed104c47 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,18 +211,18 @@ GEM devise_lastseenable (0.0.6) devise rails (>= 3.0.4) - diaspora_federation (1.0.1) + diaspora_federation (1.1.0) faraday (>= 1.0, < 3) faraday-follow_redirects (~> 0.3) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-json_schema (1.0.1) - diaspora_federation-rails (1.0.1) + diaspora_federation-json_schema (1.1.0) + diaspora_federation-rails (1.1.0) actionpack (>= 5.2, < 8) - diaspora_federation (= 1.0.1) - diaspora_federation-test (1.0.1) - diaspora_federation (= 1.0.1) + diaspora_federation (= 1.1.0) + diaspora_federation-test (1.1.0) + diaspora_federation (= 1.1.0) fabrication (~> 2.29) uuid (~> 2.3, >= 2.3.8) diff-lcs (1.5.0) @@ -238,7 +238,7 @@ GEM rake et-orbi (1.2.7) tzinfo - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) excon (0.92.3) execjs (2.8.1) @@ -248,7 +248,7 @@ GEM kostya-sigar (~> 2.0.0) state_machines thor - fabrication (2.29.0) + fabrication (2.30.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -438,7 +438,7 @@ GEM multi_json (1.15.0) multi_test (0.1.2) multi_xml (0.6.0) - multipart-post (2.2.3) + multipart-post (2.3.0) mysql2 (0.5.4) naught (1.1.0) net-imap (0.3.6) @@ -808,9 +808,9 @@ DEPENDENCIES devise (= 4.8.1) devise-two-factor (= 4.0.2) devise_lastseenable (= 0.0.6) - diaspora_federation-json_schema (= 1.0.1) - diaspora_federation-rails (= 1.0.1) - diaspora_federation-test (= 1.0.1) + diaspora_federation-json_schema (= 1.1.0) + diaspora_federation-rails (= 1.1.0) + diaspora_federation-test (= 1.1.0) eye (= 0.10.0) factory_bot_rails (= 6.2.0) faraday (= 1.10.0) From dbe644ede66a49b08eb29dc9e5f0eb560648f1e2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:25:03 +0200 Subject: [PATCH 05/49] Bump json --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e40e8d180..65517bd0c 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem "diaspora_federation-rails", "1.1.0" # API and JSON gem "acts_as_api", "1.0.1" -gem "json", "2.6.2" +gem "json", "2.6.3" gem "json-schema", "3.0.0" gem "yajl-ruby", "1.4.3" diff --git a/Gemfile.lock b/Gemfile.lock index 2ed104c47..f2f9128c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,7 @@ GEM js_image_paths (0.2.0) rails (>= 4.0, < 8.0) sprockets (>= 3.0.0) - json (2.6.2) + json (2.6.3) json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap @@ -830,7 +830,7 @@ DEPENDENCIES jquery-ui-rails (= 5.0.5) js-routes (= 2.2.4) js_image_paths (= 0.2.0) - json (= 2.6.2) + json (= 2.6.3) json-schema (= 3.0.0) leaflet-rails (= 1.7.0) listen (= 3.7.1) From ab02c86fa8d08a65e25706fa46935275a5b86ab6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:25:41 +0200 Subject: [PATCH 06/49] Bump json-schema --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 65517bd0c..3c3c799f5 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "diaspora_federation-rails", "1.1.0" gem "acts_as_api", "1.0.1" gem "json", "2.6.3" -gem "json-schema", "3.0.0" +gem "json-schema", "4.0.0" gem "yajl-ruby", "1.4.3" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index f2f9128c5..69daba5c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM aes_key_wrap bindata httpclient - json-schema (3.0.0) + json-schema (4.0.0) addressable (>= 2.8) jsonpath (1.1.2) multi_json @@ -831,7 +831,7 @@ DEPENDENCIES js-routes (= 2.2.4) js_image_paths (= 0.2.0) json (= 2.6.3) - json-schema (= 3.0.0) + json-schema (= 4.0.0) leaflet-rails (= 1.7.0) listen (= 3.7.1) logging-rails (= 0.6.0) From 906cc19eb0d98b2cca70b382301da9b94113c4cc Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:36:49 +0200 Subject: [PATCH 07/49] Bump devise --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3c3c799f5..33acee898 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem "yajl-ruby", "1.4.3" # Authentication -gem "devise", "4.8.1" +gem "devise", "4.9.2" gem "devise_lastseenable", "0.0.6" gem "devise-two-factor", "4.0.2" gem "rqrcode", "2.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 69daba5c7..cee97683f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.18) + bcrypt (3.1.19) bindata (2.4.15) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) @@ -196,7 +196,7 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.3.3) - devise (4.8.1) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -805,7 +805,7 @@ DEPENDENCIES cucumber-rails (= 2.5.1) cuprite (= 0.14.3) database_cleaner-active_record (= 2.0.1) - devise (= 4.8.1) + devise (= 4.9.2) devise-two-factor (= 4.0.2) devise_lastseenable (= 0.0.6) diaspora_federation-json_schema (= 1.1.0) From 19c48d57389e67d95465ea32c63d602a9942e605 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:37:24 +0200 Subject: [PATCH 08/49] Bump devise-two-factor --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 33acee898..a73f11f1e 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem "yajl-ruby", "1.4.3" gem "devise", "4.9.2" gem "devise_lastseenable", "0.0.6" -gem "devise-two-factor", "4.0.2" +gem "devise-two-factor", "4.1.0" gem "rqrcode", "2.1.1" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index cee97683f..9502a1321 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM mime-types (>= 2.99) unf ast (2.4.2) - attr_encrypted (3.1.0) + attr_encrypted (4.0.0) encryptor (~> 3.0.0) attr_required (1.0.1) autoprefixer-rails (10.4.7.0) @@ -202,9 +202,9 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (4.0.2) + devise-two-factor (4.1.0) activesupport (< 7.1) - attr_encrypted (>= 1.3, < 4, != 2) + attr_encrypted (>= 1.3, < 5, != 2) devise (~> 4.0) railties (< 7.1) rotp (~> 6.0) @@ -610,7 +610,7 @@ GEM actionpack (>= 5.2) railties (>= 5.2) rexml (3.2.5) - rotp (6.2.0) + rotp (6.2.2) rqrcode (2.1.1) chunky_png (~> 1.0) rqrcode_core (~> 1.0) @@ -806,7 +806,7 @@ DEPENDENCIES cuprite (= 0.14.3) database_cleaner-active_record (= 2.0.1) devise (= 4.9.2) - devise-two-factor (= 4.0.2) + devise-two-factor (= 4.1.0) devise_lastseenable (= 0.0.6) diaspora_federation-json_schema (= 1.1.0) diaspora_federation-rails (= 1.1.0) From cc4d2e08325ee3570facab0922fb8837eb79e698 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:38:34 +0200 Subject: [PATCH 09/49] Bump rqrcode --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a73f11f1e..5a5828660 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem "yajl-ruby", "1.4.3" gem "devise", "4.9.2" gem "devise_lastseenable", "0.0.6" gem "devise-two-factor", "4.1.0" -gem "rqrcode", "2.1.1" +gem "rqrcode", "2.2.0" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 9502a1321..0f15a2565 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -611,7 +611,7 @@ GEM railties (>= 5.2) rexml (3.2.5) rotp (6.2.2) - rqrcode (2.1.1) + rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -871,7 +871,7 @@ DEPENDENCIES redcarpet (= 3.5.1) redis (= 4.7.0) responders (= 3.1.0) - rqrcode (= 2.1.1) + rqrcode (= 2.2.0) rspec-json_expectations (~> 2.1) rspec-rails (= 5.1.2) rubocop (= 0.93.1) From a59505574a66875dd8a8dc145b6110c0411a3d44 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 01:40:46 +0200 Subject: [PATCH 10/49] Bump sidekiq, sidekiq-cron and migrate to redis-client This breaks compatibility with redis <6 --- Gemfile | 6 ++-- Gemfile.lock | 29 ++++++++++--------- app/controllers/invitations_controller.rb | 2 +- app/workers/archive_base.rb | 2 +- script/server | 3 +- .../invitations_controller_spec.rb | 4 +-- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 5a5828660..9bd02be78 100644 --- a/Gemfile +++ b/Gemfile @@ -42,12 +42,12 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha" # Background processing -gem "redis", "4.7.0" -gem "sidekiq", "6.5.1" +gem "redis-client", "0.14.1" +gem "sidekiq", "7.1.2" # Scheduled processing -gem "sidekiq-cron", "1.6.0" +gem "sidekiq-cron", "1.10.1" # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 0f15a2565..5bdd3b938 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM coderay (1.1.3) concurrent-ruby (1.2.2) configurate (0.5.0) - connection_pool (2.2.5) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) @@ -311,7 +311,7 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (1.1.0) - fugit (1.5.3) + fugit (1.8.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) fuubar (2.5.1) @@ -602,7 +602,8 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) - redis (4.7.0) + redis-client (0.14.1) + connection_pool regexp_parser (2.8.1) request_store (1.5.1) rack (>= 1.4) @@ -676,13 +677,15 @@ GEM secure_headers (6.3.3) shoulda-matchers (4.5.1) activesupport (>= 4.2.0) - sidekiq (6.5.1) - connection_pool (>= 2.2.2) - rack (~> 2.0) - redis (>= 4.2.0) - sidekiq-cron (1.6.0) - fugit (~> 1) - sidekiq (>= 4.2.1) + sidekiq (7.1.2) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.14.0) + sidekiq-cron (1.10.1) + fugit (~> 1.8) + globalid (>= 1.0.1) + sidekiq (>= 6) simple_captcha2 (0.5.0) rails (>= 4.1) simple_oauth (0.3.1) @@ -869,7 +872,7 @@ DEPENDENCIES rails-i18n (= 6.0.0) rails-timeago (= 2.20.0) redcarpet (= 3.5.1) - redis (= 4.7.0) + redis-client (= 0.14.1) responders (= 3.1.0) rqrcode (= 2.2.0) rspec-json_expectations (~> 2.1) @@ -881,8 +884,8 @@ DEPENDENCIES sassc-rails (= 2.1.2) secure_headers (= 6.3.3) shoulda-matchers (= 4.5.1) - sidekiq (= 6.5.1) - sidekiq-cron (= 1.6.0) + sidekiq (= 7.1.2) + sidekiq-cron (= 1.10.1) simple_captcha2 (= 0.5.0) simplecov (= 0.21.2) sinon-rails (= 1.15.0) diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb index c6a5f516c..65486642d 100644 --- a/app/controllers/invitations_controller.rb +++ b/app/controllers/invitations_controller.rb @@ -30,7 +30,7 @@ class InvitationsController < ApplicationController session[:invalid_email_invites] = invalid_emails unless valid_emails.empty? - Workers::Mail::InviteEmail.perform_async(valid_emails.join(","), current_user.id, inviter_params) + Workers::Mail::InviteEmail.perform_async(valid_emails.join(","), current_user.id, inviter_params.to_h) end if emails.empty? diff --git a/app/workers/archive_base.rb b/app/workers/archive_base.rb index 6b8b38a82..b6b2001e7 100644 --- a/app/workers/archive_base.rb +++ b/app/workers/archive_base.rb @@ -31,7 +31,7 @@ module Workers !(Process.pid.to_s == process_id.split(":")[1] && Thread.current.object_id.to_s(36) == thread_id) && ArchiveBase.subclasses.map(&:to_s).include?(work["payload"]["class"]) end - rescue Redis::CannotConnectError + rescue RedisClient::CannotConnectError # If code gets to this point and there is no Redis conenction, we're # running in a Test environment and have not mocked Sidekiq::Workers, so # we're not testing the concurrency-limiting behavior. diff --git a/script/server b/script/server index aee6cf4f5..af68b8f18 100755 --- a/script/server +++ b/script/server @@ -128,7 +128,8 @@ if [ -n "$redis_url" ] then redis_param="url: '$redis_url'" fi -if [ "$(bin/bundle exec ruby -e "require 'redis'; puts Redis.new($redis_param).ping" 2> /dev/null | grep -vE "is not writable|as your home directory temporarily" )" != "PONG" ] +echo $redis_param +if [ "$(bin/bundle exec ruby -e "require 'redis-client'; puts RedisClient.config($redis_param).new_client.call('PING')" 2> /dev/null | grep -vE "is not writable|as your home directory temporarily" )" != "PONG" ] then fatal "Can't connect to redis. Please check if it's running and if environment.redis is configured correctly in $CONFIG_FILE." fi diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb index 87232f401..f7cf2dfc9 100644 --- a/spec/controllers/invitations_controller_spec.rb +++ b/spec/controllers/invitations_controller_spec.rb @@ -39,7 +39,7 @@ describe InvitationsController, type: :controller do it "creates an InviteEmail worker" do expect(Workers::Mail::InviteEmail).to receive(:perform_async).with( - emails, alice.id, invite_params[:email_inviter] + emails, alice.id, invite_params[:email_inviter].stringify_keys ) post :create, params: invite_params end @@ -85,7 +85,7 @@ describe InvitationsController, type: :controller do it "creates an InviteEmail worker" do expect(Workers::Mail::InviteEmail).to receive(:perform_async).with( - valid_emails, alice.id, invite_params[:email_inviter] + valid_emails, alice.id, invite_params[:email_inviter].stringify_keys ) post :create, params: invite_params end From c11928111d41ad7bd557691e4aaa1c0f003301a8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:10:05 +0200 Subject: [PATCH 11/49] Bump terser --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9bd02be78..604b21e01 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ gem "sidekiq-cron", "1.10.1" # Compression -gem "terser", "1.1.10" +gem "terser", "1.1.16" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index 5bdd3b938..c7dacc4f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -718,7 +718,7 @@ GEM temple (0.8.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - terser (1.1.10) + terser (1.1.16) execjs (>= 0.3.0, < 3) thor (1.2.2) thread_safe (0.3.6) @@ -891,7 +891,7 @@ DEPENDENCIES sinon-rails (= 1.15.0) sprockets-rails (= 3.4.2) string-direction (= 1.2.2) - terser (= 1.1.10) + terser (= 1.1.16) timecop (= 0.9.5) toml-rb (= 2.1.2) turbo_dev_assets (= 0.0.2) From 7d7305028dd458b9ef2870f419230f2d0e4f2732 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:11:03 +0200 Subject: [PATCH 12/49] Bump toml-rb --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 604b21e01..0fc02f921 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "terser", "1.1.16" # Configuration gem "configurate", "0.5.0" -gem "toml-rb", "2.1.2" +gem "toml-rb", "2.2.0" # Cross-origin resource sharing diff --git a/Gemfile.lock b/Gemfile.lock index c7dacc4f4..57d1382ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -726,7 +726,7 @@ GEM timecop (0.9.5) timeout (0.4.0) timers (4.3.3) - toml-rb (2.1.2) + toml-rb (2.2.0) citrus (~> 3.0, > 3.0) turbo_dev_assets (0.0.2) twitter (7.0.0) @@ -893,7 +893,7 @@ DEPENDENCIES string-direction (= 1.2.2) terser (= 1.1.16) timecop (= 0.9.5) - toml-rb (= 2.1.2) + toml-rb (= 2.2.0) turbo_dev_assets (= 0.0.2) twitter (= 7.0.0) twitter-text (= 3.1.0) From 462d3936a1fc0b7e351bc76164096328515efdfa Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:12:10 +0200 Subject: [PATCH 13/49] Bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0fc02f921..a8bb1d1db 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem "toml-rb", "2.2.0" # Cross-origin resource sharing -gem "rack-cors", "1.1.1", require: "rack/cors" +gem "rack-cors", "2.0.1", require: "rack/cors" # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 57d1382ef..9bc344a0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -537,7 +537,7 @@ GEM raabro (1.4.0) racc (1.7.1) rack (2.2.7) - rack-cors (1.1.1) + rack-cors (2.0.1) rack (>= 2.0.0) rack-google-analytics (1.2.0) actionpack @@ -862,7 +862,7 @@ DEPENDENCIES pry pry-byebug puma (= 6.3.0) - rack-cors (= 1.1.1) + rack-cors (= 2.0.1) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) From 509b302073862375f08428d915afc87fb597a9c8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:12:52 +0200 Subject: [PATCH 14/49] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a8bb1d1db..e67bb8cf5 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ gem "rack-cors", "2.0.1", require: "rack/cors" # CSS -gem "autoprefixer-rails", "10.4.7.0" +gem "autoprefixer-rails", "10.4.13.0" gem "bootstrap-sass", "3.4.1" gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "sassc-rails", "2.1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 9bc344a0c..47f0bab0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,7 +83,7 @@ GEM attr_encrypted (4.0.0) encryptor (~> 3.0.0) attr_required (1.0.1) - autoprefixer-rails (10.4.7.0) + autoprefixer-rails (10.4.13.0) execjs (~> 2) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -796,7 +796,7 @@ DEPENDENCIES acts_as_api (= 1.0.1) addressable (= 2.8.0) asset_sync (= 2.15.2) - autoprefixer-rails (= 10.4.7.0) + autoprefixer-rails (= 10.4.13.0) babel-transpiler (= 0.7.0) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) From ed51a17ea6d16db84813ca12014a39dd0cedfc56 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:13:51 +0200 Subject: [PATCH 15/49] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e67bb8cf5..842769cf8 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ gem "sprockets-rails", "3.4.2" # Database group :mysql, optional: true do - gem "mysql2", "0.5.4" + gem "mysql2", "0.5.5" end group :postgresql, optional: true do gem "pg", "1.4.1" diff --git a/Gemfile.lock b/Gemfile.lock index 47f0bab0a..517b0f966 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -439,7 +439,7 @@ GEM multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.3.0) - mysql2 (0.5.4) + mysql2 (0.5.5) naught (1.1.0) net-imap (0.3.6) date @@ -841,7 +841,7 @@ DEPENDENCIES mini_magick (= 4.11.0) minitest (= 5.15.0) mobile-fu (= 1.4.0) - mysql2 (= 0.5.4) + mysql2 (= 0.5.5) net-imap net-pop net-smtp From 26b99671c40e016de782f7212839105ef8afc51e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:14:56 +0200 Subject: [PATCH 16/49] Bump pg --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 842769cf8..91bbea6c4 100644 --- a/Gemfile +++ b/Gemfile @@ -76,7 +76,7 @@ group :mysql, optional: true do gem "mysql2", "0.5.5" end group :postgresql, optional: true do - gem "pg", "1.4.1" + gem "pg", "1.5.3" end gem "activerecord-import", "1.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 517b0f966..76127c48f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -503,7 +503,7 @@ GEM parallel (1.22.1) parser (3.1.2.0) ast (~> 2.4.1) - pg (1.4.1) + pg (1.5.3) phantomjs (2.1.1.0) pronto (0.11.0) gitlab (~> 4.4, >= 4.4.0) @@ -853,7 +853,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.7.2) openid_connect (= 1.3.0) - pg (= 1.4.1) + pg (= 1.5.3) pronto (= 0.11.0) pronto-eslint (= 0.11.0) pronto-haml (= 0.11.1) From 211f34806b2b660e5c1552fb6e41a11a5e6cba7c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:15:35 +0200 Subject: [PATCH 17/49] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 91bbea6c4..e5f1a4744 100644 --- a/Gemfile +++ b/Gemfile @@ -79,7 +79,7 @@ group :postgresql, optional: true do gem "pg", "1.5.3" end -gem "activerecord-import", "1.4.0" +gem "activerecord-import", "1.4.1" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 76127c48f..6d0e8c27a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM activerecord (6.1.7.4) activemodel (= 6.1.7.4) activesupport (= 6.1.7.4) - activerecord-import (1.4.0) + activerecord-import (1.4.1) activerecord (>= 4.2) activestorage (6.1.7.4) actionpack (= 6.1.7.4) @@ -791,7 +791,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.8) - activerecord-import (= 1.4.0) + activerecord-import (= 1.4.1) acts-as-taggable-on (= 9.0.1) acts_as_api (= 1.0.1) addressable (= 2.8.0) From 3aa44edd4995f87f211f0d60fcd899a1cc6071d2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:16:51 +0200 Subject: [PATCH 18/49] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e5f1a4744..2a52367bd 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem "activerecord-import", "1.4.1" # File uploading gem "carrierwave", "2.2.4" -gem "fog-aws", "3.14.0" +gem "fog-aws", "3.19.0" gem "mini_magick", "4.11.0" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 6d0e8c27a..fc1f1047f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,7 +240,7 @@ GEM tzinfo ethon (0.16.0) ffi (>= 1.15.0) - excon (0.92.3) + excon (0.100.0) execjs (2.8.1) eye (0.10.0) celluloid (~> 0.17.3) @@ -295,7 +295,7 @@ GEM activerecord (>= 2) activesupport (>= 2) hashdiff - fog-aws (3.14.0) + fog-aws (3.19.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -427,7 +427,7 @@ GEM method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2023.0218.1) mini_magick (4.11.0) mini_mime (1.1.2) mini_portile2 (2.8.2) @@ -820,7 +820,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.7) faraday-follow_redirects (= 0.3.0) fixture_builder (= 0.5.2) - fog-aws (= 3.14.0) + fog-aws (= 3.19.0) fuubar (= 2.5.1) gon (= 6.4.0) haml_lint (= 0.40.0) From 8184031c4a297c5d3a0e758eca81f4ba7aae0f3a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:17:57 +0200 Subject: [PATCH 19/49] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2a52367bd..3a8a18c0a 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem "activerecord-import", "1.4.1" gem "carrierwave", "2.2.4" gem "fog-aws", "3.19.0" -gem "mini_magick", "4.11.0" +gem "mini_magick", "4.12.0" # GUID generation gem "uuid", "2.3.9" diff --git a/Gemfile.lock b/Gemfile.lock index fc1f1047f..8453c3ddd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,7 +428,7 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) - mini_magick (4.11.0) + mini_magick (4.12.0) mini_mime (1.1.2) mini_portile2 (2.8.2) minitest (5.15.0) @@ -838,7 +838,7 @@ DEPENDENCIES leaflet-rails (= 1.7.0) listen (= 3.7.1) logging-rails (= 0.6.0) - mini_magick (= 4.11.0) + mini_magick (= 4.12.0) minitest (= 5.15.0) mobile-fu (= 1.4.0) mysql2 (= 0.5.5) From abedbf10bdf22d0ae9ab43e91c577ae124682621 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:21:14 +0200 Subject: [PATCH 20/49] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3a8a18c0a..9b6b57f8d 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem "handlebars_assets", "0.23.9" gem "jquery-rails", "4.5.0" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.2.0" -gem "js-routes", "2.2.4" +gem "js-routes", "2.2.5" # Localization diff --git a/Gemfile.lock b/Gemfile.lock index 8453c3ddd..5604d1b95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -382,7 +382,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (2.2.4) + js-routes (2.2.5) railties (>= 4) js_image_paths (0.2.0) rails (>= 4.0, < 8.0) @@ -831,7 +831,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.5.0) jquery-ui-rails (= 5.0.5) - js-routes (= 2.2.4) + js-routes (= 2.2.5) js_image_paths (= 0.2.0) json (= 2.6.3) json-schema (= 4.0.0) From 184bd7c7fd929475a30bdcf53f35d5809c7edb83 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:24:41 +0200 Subject: [PATCH 21/49] Bump rails-i18n --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 9b6b57f8d..c5723b4c7 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,7 @@ gem "js-routes", "2.2.5" # Localization gem "http_accept_language", "2.1.1" -gem "rails-i18n", "6.0.0" +gem "rails-i18n", "7.0.7" # Map gem "leaflet-rails", "1.7.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5604d1b95..891c1e2a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -582,9 +582,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - rails-i18n (6.0.0) + rails-i18n (7.0.7) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) + railties (>= 6.0.0, < 8) rails-timeago (2.20.0) actionpack (>= 5.2) activesupport (>= 5.2) @@ -869,7 +869,7 @@ DEPENDENCIES rack-ssl (= 1.4.1) rails (= 6.1.7.4) rails-controller-testing (= 1.0.5) - rails-i18n (= 6.0.0) + rails-i18n (= 7.0.7) rails-timeago (= 2.20.0) redcarpet (= 3.5.1) redis-client (= 0.14.1) From f8fe91421260ff1ce51156c399b02c5190a84453 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:28:53 +0200 Subject: [PATCH 22/49] Bump leaflet-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c5723b4c7..c54b44d17 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,7 @@ gem "http_accept_language", "2.1.1" gem "rails-i18n", "7.0.7" # Map -gem "leaflet-rails", "1.7.0" +gem "leaflet-rails", "1.9.3" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index 891c1e2a1..410e00ef8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -399,7 +399,7 @@ GEM multi_json jwt (2.7.1) kostya-sigar (2.0.10) - leaflet-rails (1.7.0) + leaflet-rails (1.9.3) rails (>= 4.2.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -835,7 +835,7 @@ DEPENDENCIES js_image_paths (= 0.2.0) json (= 2.6.3) json-schema (= 4.0.0) - leaflet-rails (= 1.7.0) + leaflet-rails (= 1.9.3) listen (= 3.7.1) logging-rails (= 0.6.0) mini_magick (= 4.12.0) From a7320a872c82ff2e921bdb03f654009cb43c789b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:30:31 +0200 Subject: [PATCH 23/49] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index c54b44d17..ea928e133 100644 --- a/Gemfile +++ b/Gemfile @@ -109,7 +109,7 @@ gem "leaflet-rails", "1.9.3" # Parsing -gem "nokogiri", "1.13.7" +gem "nokogiri", "1.15.2" gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb gem "redcarpet", "3.5.1" gem "ruby-oembed", "0.16.1" diff --git a/Gemfile.lock b/Gemfile.lock index 410e00ef8..6f465fc32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,8 +451,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.13.7) - mini_portile2 (~> 2.8.0) + nokogiri (1.15.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (0.5.10) oauth2 (2.0.2) @@ -845,7 +845,7 @@ DEPENDENCIES net-imap net-pop net-smtp - nokogiri (= 1.13.7) + nokogiri (= 1.15.2) omniauth (= 2.1.0) omniauth-rails_csrf_protection (= 1.0.1) omniauth-tumblr (= 1.2) From 386717b6c470ff68d24db8b1cfdd25cdae217b3e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:31:42 +0200 Subject: [PATCH 24/49] Bump redcarpet --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ea928e133..ca47ea963 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ gem "leaflet-rails", "1.9.3" gem "nokogiri", "1.15.2" gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb -gem "redcarpet", "3.5.1" +gem "redcarpet", "3.6.0" gem "ruby-oembed", "0.16.1" gem "twitter-text", "3.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6f465fc32..d5a41ef5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -601,7 +601,7 @@ GEM rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.1) + redcarpet (3.6.0) redis-client (0.14.1) connection_pool regexp_parser (2.8.1) @@ -871,7 +871,7 @@ DEPENDENCIES rails-controller-testing (= 1.0.5) rails-i18n (= 7.0.7) rails-timeago (= 2.20.0) - redcarpet (= 3.5.1) + redcarpet (= 3.6.0) redis-client (= 0.14.1) responders (= 3.1.0) rqrcode (= 2.2.0) From 8ccca9609f749c9f114003ecbf145851aeadd190 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:33:16 +0200 Subject: [PATCH 25/49] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ca47ea963..0d6a94195 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ gem "string-direction", "1.2.2" # Security Headers -gem "secure_headers", "6.3.3" +gem "secure_headers", "6.5.0" # Services diff --git a/Gemfile.lock b/Gemfile.lock index d5a41ef5c..fd3d8448e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -674,7 +674,7 @@ GEM faraday (> 0.8, < 2.0) scss_lint (0.60.0) sass (~> 3.5, >= 3.5.5) - secure_headers (6.3.3) + secure_headers (6.5.0) shoulda-matchers (4.5.1) activesupport (>= 4.2.0) sidekiq (7.1.2) @@ -882,7 +882,7 @@ DEPENDENCIES ruby-oembed (= 0.16.1) rubyzip (= 2.3.2) sassc-rails (= 2.1.2) - secure_headers (= 6.3.3) + secure_headers (= 6.5.0) shoulda-matchers (= 4.5.1) sidekiq (= 7.1.2) sidekiq-cron (= 1.10.1) From 4068de6d7573ad797d83fc73bf93f7ec728eecb7 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:35:12 +0200 Subject: [PATCH 26/49] Bump omniauth --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 0d6a94195..c65c60ee7 100644 --- a/Gemfile +++ b/Gemfile @@ -125,7 +125,7 @@ gem "secure_headers", "6.5.0" # Services -gem "omniauth", "2.1.0" +gem "omniauth", "2.1.1" gem "omniauth-rails_csrf_protection", "1.0.1" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index fd3d8448e..3a1972633 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -465,7 +465,7 @@ GEM octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (2.1.0) + omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -551,7 +551,7 @@ GEM json-jwt (>= 1.11.0) rack (>= 2.1.0) rack-piwik (0.3.0) - rack-protection (2.2.0) + rack-protection (3.0.6) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) @@ -846,7 +846,7 @@ DEPENDENCIES net-pop net-smtp nokogiri (= 1.15.2) - omniauth (= 2.1.0) + omniauth (= 2.1.1) omniauth-rails_csrf_protection (= 1.0.1) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) From ab08d97ddaf59fd2fc547e83c8e9651a75c70575 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:37:36 +0200 Subject: [PATCH 27/49] Bump twitter --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index c65c60ee7..a6ba59a05 100644 --- a/Gemfile +++ b/Gemfile @@ -130,7 +130,7 @@ gem "omniauth-rails_csrf_protection", "1.0.1" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" gem "omniauth-wordpress", "0.2.2" -gem "twitter", "7.0.0" +gem "twitter", "8.0.0" # OpenID Connect gem "openid_connect", "1.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 3a1972633..24c53f83f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) bootstrap-switch-rails (3.3.3) - buftok (0.2.0) + buftok (0.3.0) builder (3.2.4) byebug (11.1.3) capybara (3.39.2) @@ -346,18 +346,15 @@ GEM tilt (>= 1.2) hashdiff (1.0.1) hashie (5.0.0) - http (4.4.1) - addressable (~> 2.3) + http (5.1.1) + addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp-ffi (~> 0.4.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) - http_parser.rb (0.6.0) httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) @@ -405,6 +402,9 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) little-plugger (1.1.4) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) @@ -729,13 +729,13 @@ GEM toml-rb (2.2.0) citrus (~> 3.0, > 3.0) turbo_dev_assets (0.0.2) - twitter (7.0.0) + twitter (8.0.0) addressable (~> 2.3) - buftok (~> 0.2.0) + buftok (~> 0.3.0) equalizer (~> 0.0.11) - http (~> 4.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http (~> 5.1) + http-form_data (~> 2.3) + llhttp-ffi (~> 0.4.0) memoizable (~> 0.4.0) multipart-post (~> 2.0) naught (~> 1.0) @@ -895,7 +895,7 @@ DEPENDENCIES timecop (= 0.9.5) toml-rb (= 2.2.0) turbo_dev_assets (= 0.0.2) - twitter (= 7.0.0) + twitter (= 8.0.0) twitter-text (= 3.1.0) typhoeus (= 1.4.0) uuid (= 2.3.9) From 9f5d2a8ac638395d5c475f0d6153bd60361259a3 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:40:08 +0200 Subject: [PATCH 28/49] Bump active_model_serializers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a6ba59a05..38f99d34d 100644 --- a/Gemfile +++ b/Gemfile @@ -137,7 +137,7 @@ gem "openid_connect", "1.3.0" # Serializers -gem "active_model_serializers", "0.9.8" +gem "active_model_serializers", "0.9.9" # Tags diff --git a/Gemfile.lock b/Gemfile.lock index 24c53f83f..304bbc716 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,7 +39,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_model_serializers (0.9.8) + active_model_serializers (0.9.9) activemodel (>= 3.2) concurrent-ruby (~> 1.0) activejob (6.1.7.4) @@ -790,7 +790,7 @@ PLATFORMS ruby DEPENDENCIES - active_model_serializers (= 0.9.8) + active_model_serializers (= 0.9.9) activerecord-import (= 1.4.1) acts-as-taggable-on (= 9.0.1) acts_as_api (= 1.0.1) From a33803ac19a9e02e2f1d637d0ca67f37188887aa Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:41:04 +0200 Subject: [PATCH 29/49] Bump addressable --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 38f99d34d..16d3ebc83 100644 --- a/Gemfile +++ b/Gemfile @@ -145,7 +145,7 @@ gem "acts-as-taggable-on", "9.0.1" # URIs and HTTP -gem "addressable", "2.8.0", require: "addressable/uri" +gem "addressable", "2.8.4", require: "addressable/uri" gem "faraday", "1.10.0" gem "faraday-cookie_jar", "0.0.7" gem "faraday-follow_redirects", "0.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 304bbc716..6bf0848a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,8 +71,8 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) asset_sync (2.15.2) activemodel (>= 4.1.0) @@ -531,7 +531,7 @@ GEM pry-byebug (3.8.0) byebug (~> 11.0) pry (~> 0.10) - public_suffix (4.0.7) + public_suffix (5.0.1) puma (6.3.0) nio4r (~> 2.0) raabro (1.4.0) @@ -794,7 +794,7 @@ DEPENDENCIES activerecord-import (= 1.4.1) acts-as-taggable-on (= 9.0.1) acts_as_api (= 1.0.1) - addressable (= 2.8.0) + addressable (= 2.8.4) asset_sync (= 2.15.2) autoprefixer-rails (= 10.4.13.0) babel-transpiler (= 0.7.0) From 64887e75c55febc0ce30f1bf90e39477ff54786c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:48:49 +0200 Subject: [PATCH 30/49] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 16d3ebc83..1e5846d26 100644 --- a/Gemfile +++ b/Gemfile @@ -154,7 +154,7 @@ gem "typhoeus", "1.4.0" # Views gem "gon", "6.4.0" -gem "hamlit", "2.16.0" +gem "hamlit", "3.0.3" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.20.0" gem "will_paginate", "3.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index 6bf0848a1..237f7fd15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.16.0) + hamlit (3.0.3) temple (>= 0.8.2) thor tilt @@ -715,14 +715,14 @@ GEM ffi (~> 1.1) sysexits (1.2.0) systemu (2.6.5) - temple (0.8.2) + temple (0.10.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) terser (1.1.16) execjs (>= 0.3.0, < 3) thor (1.2.2) thread_safe (0.3.6) - tilt (2.0.10) + tilt (2.2.0) timecop (0.9.5) timeout (0.4.0) timers (4.3.3) @@ -824,7 +824,7 @@ DEPENDENCIES fuubar (= 2.5.1) gon (= 6.4.0) haml_lint (= 0.40.0) - hamlit (= 2.16.0) + hamlit (= 3.0.3) handlebars_assets (= 0.23.9) http_accept_language (= 2.1.1) jasmine (= 3.10.0) From 7cefa8577ac5213ae30d5a472b5981bd2c6f4767 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:50:21 +0200 Subject: [PATCH 31/49] Bump will_paginate --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/initializers/will_paginate.rb | 16 ++++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 1e5846d26..2ec6fc10a 100644 --- a/Gemfile +++ b/Gemfile @@ -157,7 +157,7 @@ gem "gon", "6.4.0" gem "hamlit", "3.0.3" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.20.0" -gem "will_paginate", "3.3.1" +gem "will_paginate", "4.0.0" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index 237f7fd15..8addc9700 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -778,7 +778,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (3.3.1) + will_paginate (4.0.0) xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.3) @@ -901,7 +901,7 @@ DEPENDENCIES uuid (= 2.3.9) versionist (= 2.0.1) webmock (= 3.14.0) - will_paginate (= 3.3.1) + will_paginate (= 4.0.0) yajl-ruby (= 1.4.3) BUNDLED WITH diff --git a/config/initializers/will_paginate.rb b/config/initializers/will_paginate.rb index f48c76cbd..46c24b49d 100644 --- a/config/initializers/will_paginate.rb +++ b/config/initializers/will_paginate.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'will_paginate/array' +require "will_paginate/array" # Optional for Bootstrap :renderer => WillPaginate::ActionView::BootstrapLinkRenderer # https://github.com/yrgoldteeth/bootstrap-will_paginate module WillPaginate module ActionView - def will_paginate(collection = nil, options = {} ) + def will_paginate(collection=nil, options={}) options, collection = collection, nil if collection.is_a? Hash # Taken from original will_paginate code to handle if the helper is not passed a collection object. collection ||= infer_collection_from_controller @@ -23,15 +23,19 @@ module WillPaginate end def page_number(page) - tag :li, link(page, page, :rel => rel_value(page)), :class => ('active' if page == current_page) + tag :li, link(page, page, rel: rel_value(page)), class: ("active" if page == current_page) end def gap - tag :li, link(super, '#'), :class => 'disabled' + tag :li, link(super, "#"), class: "disabled" end - def previous_or_next_page(page, text, classname) - tag :li, link(text, page || '#'), :class => [classname[0..3], classname, ('disabled' unless page)].join(' ') + def previous_or_next_page(page, text, classname, aria_label=nil) + tag :li, link(text, page || "#"), + { + class: [classname[0..3], classname, ("disabled" unless page)].join(" "), + "aria-label": aria_label + } end end end From bb8486eec5a6afb5968d473fda853491885ce427 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:52:22 +0200 Subject: [PATCH 32/49] Bump minitest --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2ec6fc10a..653dd73b4 100644 --- a/Gemfile +++ b/Gemfile @@ -172,7 +172,7 @@ gem "rubyzip", "2.3.2", require: "zip" # https://github.com/gitlabhq/gitlabhq/issues/3826 # https://github.com/gitlabhq/gitlabhq/pull/3852 # https://github.com/discourse/discourse/pull/238 -gem "minitest", "5.15.0" +gem "minitest", "5.18.1" gem "versionist", "2.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 8addc9700..bb6d8539c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -431,7 +431,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.2) mini_portile2 (2.8.2) - minitest (5.15.0) + minitest (5.18.1) mobile-fu (1.4.0) rack-mobile-detect rails @@ -839,7 +839,7 @@ DEPENDENCIES listen (= 3.7.1) logging-rails (= 0.6.0) mini_magick (= 4.12.0) - minitest (= 5.15.0) + minitest (= 5.18.1) mobile-fu (= 1.4.0) mysql2 (= 0.5.5) net-imap From e3149bdea8dbcb33679a0083a88eb9e529b5bf2e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:53:52 +0200 Subject: [PATCH 33/49] Bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 653dd73b4..4c839a760 100644 --- a/Gemfile +++ b/Gemfile @@ -193,7 +193,7 @@ group :production do # we don"t install these on travis to speed up test runs # Third party asset hosting - gem "asset_sync", "2.15.2", require: false + gem "asset_sync", "2.18.0", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index bb6d8539c..f529a2e3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) - asset_sync (2.15.2) + asset_sync (2.18.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -795,7 +795,7 @@ DEPENDENCIES acts-as-taggable-on (= 9.0.1) acts_as_api (= 1.0.1) addressable (= 2.8.4) - asset_sync (= 2.15.2) + asset_sync (= 2.18.0) autoprefixer-rails (= 10.4.13.0) babel-transpiler (= 0.7.0) bootstrap-sass (= 3.4.1) From d37193f24c4a69e09583e8d936f70bcd7367ed6d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:58:31 +0200 Subject: [PATCH 34/49] Bump pronto --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 4c839a760..37e0d7d8e 100644 --- a/Gemfile +++ b/Gemfile @@ -199,7 +199,7 @@ end group :development do # Linters gem "haml_lint", "0.40.0", require: false - gem "pronto", "0.11.0", require: false + gem "pronto", "0.11.1", require: false gem "pronto-eslint", "0.11.0", require: false gem "pronto-haml", "0.11.1", require: false gem "pronto-rubocop", "0.11.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index f529a2e3d..1ddd135fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -317,8 +317,8 @@ GEM fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - gitlab (4.18.0) - httparty (~> 0.18) + gitlab (4.19.0) + httparty (~> 0.20) terminal-table (>= 1.5.1) globalid (1.1.0) activesupport (>= 5.0) @@ -355,8 +355,8 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) http_accept_language (2.1.1) - httparty (0.20.0) - mime-types (~> 3.0) + httparty (0.21.0) + mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.14.1) @@ -462,9 +462,9 @@ GEM rack (>= 1.2, < 3) rash_alt (>= 0.4, < 1) version_gem (~> 1.0) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (6.1.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) @@ -505,13 +505,13 @@ GEM ast (~> 2.4.1) pg (1.5.3) phantomjs (2.1.1.0) - pronto (0.11.0) - gitlab (~> 4.4, >= 4.4.0) - httparty (>= 0.13.7) - octokit (~> 4.7, >= 4.7.0) + pronto (0.11.1) + gitlab (>= 4.4.0, < 5.0) + httparty (>= 0.13.7, < 1.0) + octokit (>= 4.7.0, < 7.0) rainbow (>= 2.2, < 4.0) - rexml (~> 3.2) - rugged (>= 0.23.0, < 1.1.0) + rexml (>= 3.2.5, < 4.0) + rugged (>= 0.23.0, < 2.0) thor (>= 0.20.3, < 2.0) pronto-eslint (0.11.0) eslintrb (~> 2.0, >= 2.0.0) @@ -655,7 +655,7 @@ GEM ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) - rugged (1.0.1) + rugged (1.6.3) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -669,9 +669,9 @@ GEM sprockets (> 3.0) sprockets-rails tilt - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) scss_lint (0.60.0) sass (~> 3.5, >= 3.5.5) secure_headers (6.5.0) @@ -854,7 +854,7 @@ DEPENDENCIES open_graph_reader (= 0.7.2) openid_connect (= 1.3.0) pg (= 1.5.3) - pronto (= 0.11.0) + pronto (= 0.11.1) pronto-eslint (= 0.11.0) pronto-haml (= 0.11.1) pronto-rubocop (= 0.11.1) From 4fbd5b226b9e0ded3354a8acb1697d306a7e83c7 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 02:59:39 +0200 Subject: [PATCH 35/49] Bump pronto-eslint --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 37e0d7d8e..e021790f4 100644 --- a/Gemfile +++ b/Gemfile @@ -200,7 +200,7 @@ group :development do # Linters gem "haml_lint", "0.40.0", require: false gem "pronto", "0.11.1", require: false - gem "pronto-eslint", "0.11.0", require: false + gem "pronto-eslint", "0.11.1", require: false gem "pronto-haml", "0.11.1", require: false gem "pronto-rubocop", "0.11.1", require: false gem "pronto-scss", "0.11.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1ddd135fb..52bf05de3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -513,7 +513,7 @@ GEM rexml (>= 3.2.5, < 4.0) rugged (>= 0.23.0, < 2.0) thor (>= 0.20.3, < 2.0) - pronto-eslint (0.11.0) + pronto-eslint (0.11.1) eslintrb (~> 2.0, >= 2.0.0) pronto (~> 0.11.0) pronto-haml (0.11.1) @@ -855,7 +855,7 @@ DEPENDENCIES openid_connect (= 1.3.0) pg (= 1.5.3) pronto (= 0.11.1) - pronto-eslint (= 0.11.0) + pronto-eslint (= 0.11.1) pronto-haml (= 0.11.1) pronto-rubocop (= 0.11.1) pronto-scss (= 0.11.0) From dbc095c8957dd0eb237dac9f0c21515f11d9744a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:00:51 +0200 Subject: [PATCH 36/49] Bump pronto-rubocop --- Gemfile | 2 +- Gemfile.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index e021790f4..2ac7c5ea8 100644 --- a/Gemfile +++ b/Gemfile @@ -202,7 +202,7 @@ group :development do gem "pronto", "0.11.1", require: false gem "pronto-eslint", "0.11.1", require: false gem "pronto-haml", "0.11.1", require: false - gem "pronto-rubocop", "0.11.1", require: false + gem "pronto-rubocop", "0.11.5", require: false gem "pronto-scss", "0.11.0", require: false gem "rubocop", "0.93.1", require: false gem "rubocop-rails", "2.9.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 52bf05de3..a525ee721 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -500,9 +500,10 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.22.1) - parser (3.1.2.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc pg (1.5.3) phantomjs (2.1.1.0) pronto (0.11.1) @@ -519,7 +520,7 @@ GEM pronto-haml (0.11.1) haml_lint (~> 0.23) pronto (~> 0.11.0) - pronto-rubocop (0.11.1) + pronto-rubocop (0.11.5) pronto (~> 0.11.0) rubocop (>= 0.63.1, < 2.0) pronto-scss (0.11.0) @@ -643,14 +644,14 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.17.0) - parser (>= 3.1.1.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) ruby-oembed (0.16.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) @@ -857,7 +858,7 @@ DEPENDENCIES pronto (= 0.11.1) pronto-eslint (= 0.11.1) pronto-haml (= 0.11.1) - pronto-rubocop (= 0.11.1) + pronto-rubocop (= 0.11.5) pronto-scss (= 0.11.0) pry pry-byebug From d180cd2eafb6862c426cf128be9e3ed26a401c04 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:16:19 +0200 Subject: [PATCH 37/49] Bump rubocop --- .rubocop.yml | 9 +++++++-- Gemfile | 4 ++-- Gemfile.lock | 25 ++++++++++++++----------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index a2791b457..e3306ee3d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ require: rubocop-rails AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 NewCops: enable Exclude: - "bin/**/*" @@ -39,7 +39,7 @@ Metrics/PerceivedComplexity: # Some blocks are longer. Metrics/BlockLength: - ExcludedMethods: + AllowedMethods: - "namespace" - "create_table" Exclude: @@ -168,6 +168,11 @@ Style/Documentation: Naming/BinaryOperatorParameterName: Enabled: false +# Defining constants in tests is fine, and it's good to have them close to the test where they are used. +Lint/ConstantDefinitionInBlock: + Exclude: + - "spec/**/*" + # There are valid cases, for example debugging Cucumber steps, # also they'll fail CI anyway Lint/Debugger: diff --git a/Gemfile b/Gemfile index 2ac7c5ea8..8e8726197 100644 --- a/Gemfile +++ b/Gemfile @@ -204,8 +204,8 @@ group :development do gem "pronto-haml", "0.11.1", require: false gem "pronto-rubocop", "0.11.5", require: false gem "pronto-scss", "0.11.0", require: false - gem "rubocop", "0.93.1", require: false - gem "rubocop-rails", "2.9.1", require: false + gem "rubocop", "1.53.1", require: false + gem "rubocop-rails", "2.20.2", require: false # Debugging gem "pry" diff --git a/Gemfile.lock b/Gemfile.lock index a525ee721..d0d4a17bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,6 +396,7 @@ GEM multi_json jwt (2.7.1) kostya-sigar (2.0.10) + language_server-protocol (3.17.0.3) leaflet-rails (1.9.3) rails (>= 4.2.0) listen (3.7.1) @@ -635,21 +636,23 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.11.0) - rubocop (0.93.1) + rubocop (1.53.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) + unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-rails (2.9.1) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) ruby-oembed (0.16.1) ruby-progressbar (1.13.0) ruby-vips (2.1.4) @@ -751,7 +754,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.4.2) uuid (2.3.9) macaddr (~> 1.0) valid (1.2.0) @@ -878,8 +881,8 @@ DEPENDENCIES rqrcode (= 2.2.0) rspec-json_expectations (~> 2.1) rspec-rails (= 5.1.2) - rubocop (= 0.93.1) - rubocop-rails (= 2.9.1) + rubocop (= 1.53.1) + rubocop-rails (= 2.20.2) ruby-oembed (= 0.16.1) rubyzip (= 2.3.2) sassc-rails (= 2.1.2) From f2c0688aedbf498be020bc0ce13c84237d811cce Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:19:57 +0200 Subject: [PATCH 38/49] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 8e8726197..42101ebb8 100644 --- a/Gemfile +++ b/Gemfile @@ -198,7 +198,7 @@ end group :development do # Linters - gem "haml_lint", "0.40.0", require: false + gem "haml_lint", "0.46.0", require: false gem "pronto", "0.11.1", require: false gem "pronto-eslint", "0.11.1", require: false gem "pronto-haml", "0.11.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index d0d4a17bf..02ede60bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -327,14 +327,15 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.1.1) + temple (>= 0.8.2) + thor tilt - haml_lint (0.40.0) - haml (>= 4.0, < 5.3) + haml_lint (0.46.0) + haml (>= 4.0, < 6.2) parallel (~> 1.10) rainbow - rubocop (>= 0.50.0) + rubocop (>= 1.0) sysexits (~> 1.1) hamlit (3.0.3) temple (>= 0.8.2) @@ -827,7 +828,7 @@ DEPENDENCIES fog-aws (= 3.19.0) fuubar (= 2.5.1) gon (= 6.4.0) - haml_lint (= 0.40.0) + haml_lint (= 0.46.0) hamlit (= 3.0.3) handlebars_assets (= 0.23.9) http_accept_language (= 2.1.1) From 3c3d73fedb63858103f4aaa1dde12d555eeee629 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:20:57 +0200 Subject: [PATCH 39/49] Bump simplecov --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 42101ebb8..4c1a178f5 100644 --- a/Gemfile +++ b/Gemfile @@ -212,7 +212,7 @@ group :development do gem "pry-byebug" # test coverage - gem "simplecov", "0.21.2", require: false + gem "simplecov", "0.22.0", require: false gem "turbo_dev_assets", "0.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index 02ede60bc..4cfa9cc7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -694,7 +694,7 @@ GEM simple_captcha2 (0.5.0) rails (>= 4.1) simple_oauth (0.3.1) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) @@ -892,7 +892,7 @@ DEPENDENCIES sidekiq (= 7.1.2) sidekiq-cron (= 1.10.1) simple_captcha2 (= 0.5.0) - simplecov (= 0.21.2) + simplecov (= 0.22.0) sinon-rails (= 1.15.0) sprockets-rails (= 3.4.2) string-direction (= 1.2.2) From 302bd0392322567a6ee2966b379e70df5e242af2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:21:51 +0200 Subject: [PATCH 40/49] Bump listen --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 4c1a178f5..63728ea4a 100644 --- a/Gemfile +++ b/Gemfile @@ -216,7 +216,7 @@ group :development do gem "turbo_dev_assets", "0.0.2" - gem "listen", "3.7.1" + gem "listen", "3.8.0" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 4cfa9cc7d..dbfa1f7f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,7 +400,7 @@ GEM language_server-protocol (3.17.0.3) leaflet-rails (1.9.3) rails (>= 4.2.0) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) little-plugger (1.1.4) @@ -601,7 +601,7 @@ GEM rake (13.0.6) rash_alt (0.4.12) hashie (>= 3.4) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.6.0) @@ -841,7 +841,7 @@ DEPENDENCIES json (= 2.6.3) json-schema (= 4.0.0) leaflet-rails (= 1.9.3) - listen (= 3.7.1) + listen (= 3.8.0) logging-rails (= 0.6.0) mini_magick (= 4.12.0) minitest (= 5.18.1) From 00b1ed3e762f4e7a696cfc69870fd865f436d54b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:23:12 +0200 Subject: [PATCH 41/49] Bump database_cleaner-active_record --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 63728ea4a..dcc7b0ae4 100644 --- a/Gemfile +++ b/Gemfile @@ -230,7 +230,7 @@ group :test do gem "capybara", "3.39.2" gem "cuprite", "0.14.3" - gem "database_cleaner-active_record", "2.0.1" + gem "database_cleaner-active_record", "2.1.0" gem "cucumber-api-steps", "0.14", require: false diff --git a/Gemfile.lock b/Gemfile.lock index dbfa1f7f4..c85ccca46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,7 +191,7 @@ GEM cuprite (0.14.3) capybara (~> 3.0) ferrum (~> 0.13.0) - database_cleaner-active_record (2.0.1) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -812,7 +812,7 @@ DEPENDENCIES cucumber-api-steps (= 0.14) cucumber-rails (= 2.5.1) cuprite (= 0.14.3) - database_cleaner-active_record (= 2.0.1) + database_cleaner-active_record (= 2.1.0) devise (= 4.9.2) devise-two-factor (= 4.1.0) devise_lastseenable (= 0.0.6) From 313e96d5c3e16f7ce83eb19ce1843771169dfb43 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:25:12 +0200 Subject: [PATCH 42/49] Bump shoulda-matchers --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index dcc7b0ae4..313bd7c40 100644 --- a/Gemfile +++ b/Gemfile @@ -237,7 +237,7 @@ group :test do # General helpers gem "factory_bot_rails", "6.2.0" - gem "shoulda-matchers", "4.5.1" + gem "shoulda-matchers", "5.3.0" gem "timecop", "0.9.5" gem "webmock", "3.14.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index c85ccca46..20de91df6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -680,8 +680,8 @@ GEM scss_lint (0.60.0) sass (~> 3.5, >= 3.5.5) secure_headers (6.5.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) + shoulda-matchers (5.3.0) + activesupport (>= 5.2.0) sidekiq (7.1.2) concurrent-ruby (< 2) connection_pool (>= 2.3.0) @@ -888,7 +888,7 @@ DEPENDENCIES rubyzip (= 2.3.2) sassc-rails (= 2.1.2) secure_headers (= 6.5.0) - shoulda-matchers (= 4.5.1) + shoulda-matchers (= 5.3.0) sidekiq (= 7.1.2) sidekiq-cron (= 1.10.1) simple_captcha2 (= 0.5.0) From 50422c5902097400803a5e5dfd66cab879f08fb2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:25:47 +0200 Subject: [PATCH 43/49] Bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 313bd7c40..602f9c142 100644 --- a/Gemfile +++ b/Gemfile @@ -238,7 +238,7 @@ group :test do gem "factory_bot_rails", "6.2.0" gem "shoulda-matchers", "5.3.0" - gem "timecop", "0.9.5" + gem "timecop", "0.9.6" gem "webmock", "3.14.0", require: false gem "diaspora_federation-test", "1.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 20de91df6..305c239a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -728,7 +728,7 @@ GEM thor (1.2.2) thread_safe (0.3.6) tilt (2.2.0) - timecop (0.9.5) + timecop (0.9.6) timeout (0.4.0) timers (4.3.3) toml-rb (2.2.0) @@ -897,7 +897,7 @@ DEPENDENCIES sprockets-rails (= 3.4.2) string-direction (= 1.2.2) terser (= 1.1.16) - timecop (= 0.9.5) + timecop (= 0.9.6) toml-rb (= 2.2.0) turbo_dev_assets (= 0.0.2) twitter (= 8.0.0) From bdfaff500990571dfaccbe9414f3cbf85c8835dd Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:27:01 +0200 Subject: [PATCH 44/49] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 602f9c142..d652a844c 100644 --- a/Gemfile +++ b/Gemfile @@ -239,7 +239,7 @@ group :test do gem "factory_bot_rails", "6.2.0" gem "shoulda-matchers", "5.3.0" gem "timecop", "0.9.6" - gem "webmock", "3.14.0", require: false + gem "webmock", "3.18.1", require: false gem "diaspora_federation-test", "1.1.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 305c239a5..e9f6a7ceb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -775,7 +775,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.14.0) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -905,7 +905,7 @@ DEPENDENCIES typhoeus (= 1.4.0) uuid (= 2.3.9) versionist (= 2.0.1) - webmock (= 3.14.0) + webmock (= 3.18.1) will_paginate (= 4.0.0) yajl-ruby (= 1.4.3) From c5699b7a43c193c532cab0efc97600cae9f7d7e9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:28:22 +0200 Subject: [PATCH 45/49] Bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index d652a844c..406c41cb4 100644 --- a/Gemfile +++ b/Gemfile @@ -246,7 +246,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "5.1.2" + gem "rspec-rails", "6.0.3" # Cucumber (integration tests) gem "cucumber-rails", "2.5.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index e9f6a7ceb..eb5aa8e10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -583,8 +583,9 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-i18n (7.0.7) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -619,24 +620,24 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.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.11.0) + rspec-support (~> 3.12.0) rspec-json_expectations (2.2.0) - rspec-mocks (3.11.1) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) rubocop (1.53.1) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -881,7 +882,7 @@ DEPENDENCIES responders (= 3.1.0) rqrcode (= 2.2.0) rspec-json_expectations (~> 2.1) - rspec-rails (= 5.1.2) + rspec-rails (= 6.0.3) rubocop (= 1.53.1) rubocop-rails (= 2.20.2) ruby-oembed (= 0.16.1) From 1bd0c7bb2d625e7dbbc00ffd9aa9c19cd66fdefd Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:29:36 +0200 Subject: [PATCH 46/49] Bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 56 +++++++++++++++++++++++----------------------------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index 406c41cb4..f36d7ba5a 100644 --- a/Gemfile +++ b/Gemfile @@ -249,7 +249,7 @@ group :development, :test do gem "rspec-rails", "6.0.3" # Cucumber (integration tests) - gem "cucumber-rails", "2.5.1", require: false + gem "cucumber-rails", "2.6.1", require: false # Jasmine (client side application tests (JS)) gem "chrome_remote", "0.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index eb5aa8e10..ab2a28c1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,47 +147,41 @@ GEM crack (0.4.5) rexml crass (1.0.6) - cucumber (7.1.0) + cucumber (8.0.0) builder (~> 3.2, >= 3.2.4) - cucumber-core (~> 10.1, >= 10.1.0) - cucumber-create-meta (~> 6.0, >= 6.0.1) - cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) - cucumber-gherkin (~> 22.0, >= 22.0.0) - cucumber-html-formatter (~> 17.0, >= 17.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) - cucumber-wire (~> 6.2, >= 6.2.0) - diff-lcs (~> 1.4, >= 1.4.4) - mime-types (~> 3.3, >= 3.3.1) - multi_test (~> 0.1, >= 0.1.2) + cucumber-ci-environment (~> 9.0, >= 9.0.4) + cucumber-core (~> 11.0, >= 11.0.0) + cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-html-formatter (~> 19.1, >= 19.1.0) + cucumber-messages (~> 18.0, >= 18.0.0) + diff-lcs (~> 1.5, >= 1.5.0) + mime-types (~> 3.4, >= 3.4.1) + multi_test (~> 1.1, >= 1.1.0) sys-uname (~> 1.2, >= 1.2.2) cucumber-api-steps (0.14.0) cucumber (>= 2.0.2) jsonpath (>= 0.1.2) - cucumber-core (10.1.1) - cucumber-gherkin (~> 22.0, >= 22.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-ci-environment (9.2.0) + cucumber-core (11.0.0) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-create-meta (6.0.4) - cucumber-messages (~> 17.1, >= 17.1.1) - sys-uname (~> 1.2, >= 1.2.2) - cucumber-cucumber-expressions (14.0.0) - cucumber-gherkin (22.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) - cucumber-html-formatter (17.0.0) - cucumber-messages (~> 17.1, >= 17.1.0) - cucumber-messages (17.1.1) - cucumber-rails (2.5.1) + cucumber-cucumber-expressions (15.2.0) + cucumber-gherkin (23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-html-formatter (19.2.0) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-messages (18.0.0) + cucumber-rails (2.6.1) capybara (>= 2.18, < 4) - cucumber (>= 3.2, < 8) + cucumber (>= 3.2, < 9) mime-types (~> 3.3) nokogiri (~> 1.10) railties (>= 5.0, < 8) rexml (~> 3.0) webrick (~> 1.7) cucumber-tag-expressions (4.1.0) - cucumber-wire (6.2.1) - cucumber-core (~> 10.1, >= 10.1.0) - cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) cuprite (0.14.3) capybara (~> 3.0) ferrum (~> 0.13.0) @@ -438,7 +432,7 @@ GEM rack-mobile-detect rails multi_json (1.15.0) - multi_test (0.1.2) + multi_test (1.1.0) multi_xml (0.6.0) multipart-post (2.3.0) mysql2 (0.5.5) @@ -717,7 +711,7 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) - sys-uname (1.2.2) + sys-uname (1.2.3) ffi (~> 1.1) sysexits (1.2.0) systemu (2.6.5) @@ -811,7 +805,7 @@ DEPENDENCIES chrome_remote (= 0.3.0) configurate (= 0.5.0) cucumber-api-steps (= 0.14) - cucumber-rails (= 2.5.1) + cucumber-rails (= 2.6.1) cuprite (= 0.14.3) database_cleaner-active_record (= 2.1.0) devise (= 4.9.2) From 62fdac807e4da12aa55e056f7754809ca2147d55 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:31:40 +0200 Subject: [PATCH 47/49] Bump faraday --- Gemfile | 3 ++- Gemfile.lock | 31 ++++++++----------------------- config/initializers/faraday.rb | 2 +- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index f36d7ba5a..6ec57618f 100644 --- a/Gemfile +++ b/Gemfile @@ -146,9 +146,10 @@ gem "acts-as-taggable-on", "9.0.1" # URIs and HTTP gem "addressable", "2.8.4", require: "addressable/uri" -gem "faraday", "1.10.0" +gem "faraday", "2.7.7" gem "faraday-cookie_jar", "0.0.7" gem "faraday-follow_redirects", "0.3.0" +gem "faraday-typhoeus", "1.0.0", require: false gem "typhoeus", "1.4.0" # Views diff --git a/Gemfile.lock b/Gemfile.lock index ab2a28c1b..9554eb3a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -248,34 +248,18 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.7.7) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (3.0.2) + faraday-typhoeus (1.0.0) + faraday (~> 2.0) + typhoeus (~> 1.4) ferrum (0.13) addressable (~> 2.5) concurrent-ruby (~> 1.1) @@ -816,9 +800,10 @@ DEPENDENCIES diaspora_federation-test (= 1.1.0) eye (= 0.10.0) factory_bot_rails (= 6.2.0) - faraday (= 1.10.0) + faraday (= 2.7.7) faraday-cookie_jar (= 0.0.7) faraday-follow_redirects (= 0.3.0) + faraday-typhoeus (= 1.0.0) fixture_builder (= 0.5.2) fog-aws (= 3.19.0) fuubar (= 2.5.1) diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb index 76f9d0a32..8896d48eb 100644 --- a/config/initializers/faraday.rb +++ b/config/initializers/faraday.rb @@ -6,7 +6,7 @@ # Use net_http in test, that's better supported by webmock unless Rails.env.test? - require 'typhoeus/adapters/faraday' + require "faraday/typhoeus" Faraday.default_adapter = :typhoeus end From c665d01cc5bd4eb381f57a0b3d69195b4f726289 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:32:32 +0200 Subject: [PATCH 48/49] Bump openid_connect --- Gemfile | 2 +- Gemfile.lock | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 6ec57618f..b803c5488 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ gem "omniauth-wordpress", "0.2.2" gem "twitter", "8.0.0" # OpenID Connect -gem "openid_connect", "1.3.0" +gem "openid_connect", "2.2.0" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index 9554eb3a1..82281accf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,7 +337,6 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) idn-ruby (0.1.0) @@ -364,11 +363,12 @@ GEM rails (>= 4.0, < 8.0) sprockets (>= 3.0.0) json (2.6.3) - json-jwt (1.15.3) + json-jwt (1.16.3) activesupport (>= 4.2) aes_key_wrap bindata - httpclient + faraday (~> 2.0) + faraday-follow_redirects json-schema (4.0.0) addressable (>= 2.8) jsonpath (1.1.2) @@ -469,16 +469,19 @@ GEM open_graph_reader (0.7.2) faraday (>= 0.9.0) nokogiri (~> 1.6) - openid_connect (1.3.0) + openid_connect (2.2.0) activemodel attr_required (>= 1.0.0) - json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.6.1) - swd (>= 1.0.0) + faraday (~> 2.0) + faraday-follow_redirects + json-jwt (>= 1.16) + net-smtp + rack-oauth2 (~> 2.2) + swd (~> 2.0) tzinfo validate_email validate_url - webfinger (>= 1.0.1) + webfinger (~> 2.0) orm_adapter (0.5.0) parallel (1.23.0) parser (3.2.2.3) @@ -525,10 +528,11 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.19.0) + rack-oauth2 (2.2.0) activesupport attr_required - httpclient + faraday (~> 2.0) + faraday-follow_redirects json-jwt (>= 1.11.0) rack (>= 2.1.0) rack-piwik (0.3.0) @@ -691,10 +695,11 @@ GEM ssrf_filter (1.1.1) state_machines (0.5.0) string-direction (1.2.2) - swd (1.3.0) + swd (2.0.2) activesupport (>= 3) attr_required (>= 0.0.5) - httpclient (>= 2.4) + faraday (~> 2.0) + faraday-follow_redirects sys-uname (1.2.3) ffi (~> 1.1) sysexits (1.2.0) @@ -751,9 +756,10 @@ GEM yard (~> 0.9.20) warden (1.2.9) rack (>= 2.0.9) - webfinger (1.2.0) + webfinger (2.1.2) activesupport - httpclient (>= 2.4) + faraday (~> 2.0) + faraday-follow_redirects webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -837,7 +843,7 @@ DEPENDENCIES omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.7.2) - openid_connect (= 1.3.0) + openid_connect (= 2.2.0) pg (= 1.5.3) pronto (= 0.11.1) pronto-eslint (= 0.11.1) From 7a8e1fe2d5cc8d108bbf6ad326215744089bd0ed Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 26 Jun 2023 03:33:36 +0200 Subject: [PATCH 49/49] Bump other dependencies not directly in Gemfile --- Gemfile.lock | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 82281accf..8c42eeda0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM multi_xml (>= 0.5.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - idn-ruby (0.1.0) + idn-ruby (0.1.5) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) @@ -371,7 +371,7 @@ GEM faraday-follow_redirects json-schema (4.0.0) addressable (>= 2.8) - jsonpath (1.1.2) + jsonpath (1.1.3) multi_json jwt (2.7.1) kostya-sigar (2.0.10) @@ -434,14 +434,19 @@ GEM nokogiri (1.15.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oauth (0.5.10) - oauth2 (2.0.2) + 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_xml (~> 0.5) - rack (>= 1.2, < 3) - rash_alt (>= 0.4, < 1) - version_gem (~> 1.0) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -509,12 +514,12 @@ GEM pronto-scss (0.11.0) pronto (~> 0.11.0) scss_lint (~> 0.43, >= 0.43.0) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.8.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.10) + pry (>= 0.13, < 0.15) public_suffix (5.0.1) puma (6.3.0) nio4r (~> 2.0) @@ -582,8 +587,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - rash_alt (0.4.12) - hashie (>= 3.4) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -685,6 +688,9 @@ GEM simplecov_json_formatter (0.1.4) sinon-rails (1.15.0) railties (>= 3.1) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) sprockets (4.2.0) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -714,7 +720,7 @@ GEM tilt (2.2.0) timecop (0.9.6) timeout (0.4.0) - timers (4.3.3) + timers (4.3.5) toml-rb (2.2.0) citrus (~> 3.0, > 3.0) turbo_dev_assets (0.0.2) @@ -749,7 +755,7 @@ GEM validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - version_gem (1.1.0) + version_gem (1.1.3) versionist (2.0.1) activesupport (>= 3) railties (>= 3) @@ -764,7 +770,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) + webrick (1.8.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -772,8 +778,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.3) - yard (0.9.28) - webrick (~> 1.7.0) + yard (0.9.34) zeitwerk (2.6.8) PLATFORMS