From 0f7ea165f7d36a6d709ee3282124e199410f5e7e Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 18:42:27 +0200
Subject: [PATCH 01/35] Bump rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 84 ++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Gemfile b/Gemfile
index 48d1d9136..36588d2b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.7.1"
+gem "rails", "5.2.8"
 
 # Legacy Rails features, remove me!
 # responders (class level)
diff --git a/Gemfile.lock b/Gemfile.lock
index c0fb9eecf..8e3e97f51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,25 +2,25 @@ GEM
   remote: https://rubygems.org/
   remote: https://gems.diasporafoundation.org/
   specs:
-    actioncable (5.2.7.1)
-      actionpack (= 5.2.7.1)
+    actioncable (5.2.8)
+      actionpack (= 5.2.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.7.1)
-      actionpack (= 5.2.7.1)
-      actionview (= 5.2.7.1)
-      activejob (= 5.2.7.1)
+    actionmailer (5.2.8)
+      actionpack (= 5.2.8)
+      actionview (= 5.2.8)
+      activejob (= 5.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.7.1)
-      actionview (= 5.2.7.1)
-      activesupport (= 5.2.7.1)
+    actionpack (5.2.8)
+      actionview (= 5.2.8)
+      activesupport (= 5.2.8)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.7.1)
-      activesupport (= 5.2.7.1)
+    actionview (5.2.8)
+      activesupport (= 5.2.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -28,22 +28,22 @@ GEM
     active_model_serializers (0.9.7)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
-    activejob (5.2.7.1)
-      activesupport (= 5.2.7.1)
+    activejob (5.2.8)
+      activesupport (= 5.2.8)
       globalid (>= 0.3.6)
-    activemodel (5.2.7.1)
-      activesupport (= 5.2.7.1)
-    activerecord (5.2.7.1)
-      activemodel (= 5.2.7.1)
-      activesupport (= 5.2.7.1)
+    activemodel (5.2.8)
+      activesupport (= 5.2.8)
+    activerecord (5.2.8)
+      activemodel (= 5.2.8)
+      activesupport (= 5.2.8)
       arel (>= 9.0)
     activerecord-import (1.1.0)
       activerecord (>= 3.2)
-    activestorage (5.2.7.1)
-      actionpack (= 5.2.7.1)
-      activerecord (= 5.2.7.1)
+    activestorage (5.2.8)
+      actionpack (= 5.2.8)
+      activerecord (= 5.2.8)
       marcel (~> 1.0.0)
-    activesupport (5.2.7.1)
+    activesupport (5.2.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -392,7 +392,7 @@ GEM
       multi_json (~> 1.14)
     logging-rails (0.6.0)
       logging (>= 1.8)
-    loofah (2.16.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     macaddr (1.7.2)
@@ -505,7 +505,7 @@ GEM
     public_suffix (4.0.6)
     raabro (1.4.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-google-analytics (1.2.0)
@@ -525,20 +525,20 @@ GEM
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.7.1)
-      actioncable (= 5.2.7.1)
-      actionmailer (= 5.2.7.1)
-      actionpack (= 5.2.7.1)
-      actionview (= 5.2.7.1)
-      activejob (= 5.2.7.1)
-      activemodel (= 5.2.7.1)
-      activerecord (= 5.2.7.1)
-      activestorage (= 5.2.7.1)
-      activesupport (= 5.2.7.1)
+    rack-test (2.0.0)
+      rack (>= 1.3)
+    rails (5.2.8)
+      actioncable (= 5.2.8)
+      actionmailer (= 5.2.8)
+      actionpack (= 5.2.8)
+      actionview (= 5.2.8)
+      activejob (= 5.2.8)
+      activemodel (= 5.2.8)
+      activerecord (= 5.2.8)
+      activestorage (= 5.2.8)
+      activesupport (= 5.2.8)
       bundler (>= 1.3.0)
-      railties (= 5.2.7.1)
+      railties (= 5.2.8)
       sprockets-rails (>= 2.0.0)
     rails-assets-autosize (4.0.2)
     rails-assets-backbone (1.3.3)
@@ -594,7 +594,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
@@ -602,9 +602,9 @@ GEM
     rails-timeago (2.19.1)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    railties (5.2.7.1)
-      actionpack (= 5.2.7.1)
-      activesupport (= 5.2.7.1)
+    railties (5.2.8)
+      actionpack (= 5.2.8)
+      activesupport (= 5.2.8)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -878,7 +878,7 @@ DEPENDENCIES
   rack-piwik (= 0.3.0)
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
-  rails (= 5.2.7.1)
+  rails (= 5.2.8)
   rails-assets-autosize (= 4.0.2)!
   rails-assets-backbone (= 1.3.3)!
   rails-assets-blueimp-gallery (= 2.33.0)!

From a8dc10f5adf2b892107ce290bbc81ca7eaa1e7ca Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 18:43:30 +0200
Subject: [PATCH 02/35] Bump unicorn

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 36588d2b5..96ae0e994 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem "responders", "3.0.1"
 
 # Appserver
 
-gem "unicorn", "6.0.0", require: false
+gem "unicorn", "6.1.0", require: false
 gem "unicorn-worker-killer", "0.4.5"
 
 # Federation
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e3e97f51..02394d583 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -609,7 +609,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.19.2)
+    raindrops (0.20.0)
     rake (12.3.3)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
@@ -759,7 +759,7 @@ GEM
       unf_ext
     unf_ext (0.0.8)
     unicode-display_width (1.8.0)
-    unicorn (6.0.0)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.5)
@@ -932,7 +932,7 @@ DEPENDENCIES
   twitter (= 7.0.0)
   twitter-text (= 1.14.7)
   typhoeus (= 1.4.0)
-  unicorn (= 6.0.0)
+  unicorn (= 6.1.0)
   unicorn-worker-killer (= 0.4.5)
   uuid (= 2.3.9)
   versionist (= 2.0.1)

From 7447beb04a0f6746db5b1fec8bba2ef28143fe08 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 18:45:10 +0200
Subject: [PATCH 03/35] Bump json

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 96ae0e994..00be971d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.7"
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.3.0"
+gem "json",        "2.6.2"
 gem "json-schema", "2.8.1"
 
 # Authentication
diff --git a/Gemfile.lock b/Gemfile.lock
index 02394d583..60206de4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,7 +366,7 @@ GEM
     js_image_paths (0.1.1)
       rails (>= 4.0, < 6.0)
       sprockets (>= 3.0.0)
-    json (2.3.0)
+    json (2.6.2)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -845,7 +845,7 @@ DEPENDENCIES
   jquery-rails (= 4.4.0)
   js-routes (= 2.1.2)
   js_image_paths (= 0.1.1)
-  json (= 2.3.0)
+  json (= 2.6.2)
   json-schema (= 2.8.1)
   json-schema-rspec (= 0.0.4)
   leaflet-rails (= 1.7.0)

From 4076eb3fcf5307ea2f023cd5f6ca81b35d1f2f00 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 19:28:19 +0200
Subject: [PATCH 04/35] Bump json-schema and remove json-schema-rspec
 (unmaintained)

---
 Gemfile                           |  3 +--
 Gemfile.lock                      | 16 ++++------------
 spec/integration/exporter_spec.rb |  3 ++-
 spec/spec_helper.rb               |  3 ---
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 00be971d4..a4aa14879 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem "diaspora_federation-rails", "0.2.7"
 
 gem "acts_as_api", "1.0.1"
 gem "json",        "2.6.2"
-gem "json-schema", "2.8.1"
+gem "json-schema", "3.0.0"
 
 # Authentication
 
@@ -269,7 +269,6 @@ group :test do
 
   gem "fixture_builder",   "0.5.2"
   gem "fuubar",            "2.5.1"
-  gem "json-schema-rspec", "0.0.4"
   gem "rspec-json_expectations", "~> 2.1"
 
   # Cucumber (integration tests)
diff --git a/Gemfile.lock b/Gemfile.lock
index 60206de4e..209b0e446 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,11 +371,8 @@ GEM
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    json-schema-rspec (0.0.4)
-      json-schema (~> 2.5)
-      rspec
+    json-schema (3.0.0)
+      addressable (>= 2.8)
     jsonpath (1.1.0)
       multi_json
     jwt (2.3.0)
@@ -502,7 +499,7 @@ GEM
     pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     raabro (1.4.0)
     racc (1.6.0)
     rack (2.2.3.1)
@@ -628,10 +625,6 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)
@@ -846,8 +839,7 @@ DEPENDENCIES
   js-routes (= 2.1.2)
   js_image_paths (= 0.1.1)
   json (= 2.6.2)
-  json-schema (= 2.8.1)
-  json-schema-rspec (= 0.0.4)
+  json-schema (= 3.0.0)
   leaflet-rails (= 1.7.0)
   listen (= 3.5.1)
   logging-rails (= 0.6.0)
diff --git a/spec/integration/exporter_spec.rb b/spec/integration/exporter_spec.rb
index 7794c07de..5a17f98d8 100644
--- a/spec/integration/exporter_spec.rb
+++ b/spec/integration/exporter_spec.rb
@@ -16,7 +16,8 @@ describe Diaspora::Exporter do
         %i[generic_user_data activity status_messages_flavours work_aspect]
       )
 
-      expect(JSON.parse(json)).to match_json_schema(:archive_schema)
+      errors = JSON::Validator.fully_validate("lib/schemas/archive-format.json", JSON.parse(json))
+      expect(errors).to be_empty
     end
 
     it "contains basic user data" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0fe4e1097..3cbdbaff0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -133,9 +133,6 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
 
-  config.include JSON::SchemaMatchers
-  config.json_schemas[:archive_schema] = "lib/schemas/archive-format.json"
-
   JSON::Validator.add_schema(
     JSON::Schema.new(
       DiasporaFederation::Schemas.federation_entities,

From d801adcb6e491e3f9bbe457599d2ea4d065d15e8 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 19:37:41 +0200
Subject: [PATCH 05/35] Bump devise

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a4aa14879..ea7e6bbee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem "json-schema", "3.0.0"
 
 # Authentication
 
-gem "devise", "4.8.0"
+gem "devise", "4.8.1"
 gem "devise_lastseenable", "0.0.6"
 gem "devise-two-factor", "4.0.1"
 gem "rqrcode", "2.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 209b0e446..99158b281 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     attr_required (1.0.1)
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bindata (2.4.10)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
@@ -191,7 +191,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    devise (4.8.0)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -811,7 +811,7 @@ DEPENDENCIES
   cucumber-api-steps (= 0.14)
   cucumber-rails (= 2.4.0)
   database_cleaner-active_record (= 2.0.1)
-  devise (= 4.8.0)
+  devise (= 4.8.1)
   devise-two-factor (= 4.0.1)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)

From 3d8cdc78e02aea74804a7c76b7028953dc8cc5d2 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 19:38:08 +0200
Subject: [PATCH 06/35] Bump devise-two-factor

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index ea7e6bbee..04f25c8fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem "json-schema", "3.0.0"
 
 gem "devise", "4.8.1"
 gem "devise_lastseenable", "0.0.6"
-gem "devise-two-factor", "4.0.1"
+gem "devise-two-factor", "4.0.2"
 gem "rqrcode", "2.1.0"
 
 # Captcha
diff --git a/Gemfile.lock b/Gemfile.lock
index 99158b281..5486bb986 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,11 +197,11 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (4.0.1)
-      activesupport (< 6.2)
+    devise-two-factor (4.0.2)
+      activesupport (< 7.1)
       attr_encrypted (>= 1.3, < 4, != 2)
       devise (~> 4.0)
-      railties (< 6.2)
+      railties (< 7.1)
       rotp (~> 6.0)
     devise_lastseenable (0.0.6)
       devise
@@ -812,7 +812,7 @@ DEPENDENCIES
   cucumber-rails (= 2.4.0)
   database_cleaner-active_record (= 2.0.1)
   devise (= 4.8.1)
-  devise-two-factor (= 4.0.1)
+  devise-two-factor (= 4.0.2)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
   diaspora_federation-json_schema (= 0.2.7)

From 5b298e330c09762ece0f8f7a592f69f691532c89 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 19:39:10 +0200
Subject: [PATCH 07/35] Bump rqrcode

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 04f25c8fd..5829f726d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem "json-schema", "3.0.0"
 gem "devise", "4.8.1"
 gem "devise_lastseenable", "0.0.6"
 gem "devise-two-factor", "4.0.2"
-gem "rqrcode", "2.1.0"
+gem "rqrcode", "2.1.1"
 
 # Captcha
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5486bb986..b782db82f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -621,7 +621,7 @@ GEM
       railties (>= 5.0)
     rexml (3.2.5)
     rotp (6.2.0)
-    rqrcode (2.1.0)
+    rqrcode (2.1.1)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
@@ -900,7 +900,7 @@ DEPENDENCIES
   redcarpet (= 3.5.1)
   redis (= 4.5.1)
   responders (= 3.0.1)
-  rqrcode (= 2.1.0)
+  rqrcode (= 2.1.1)
   rspec-json_expectations (~> 2.1)
   rspec-rails (= 5.0.2)
   rubocop (= 0.93.1)

From db74b364d688ff59a9f2c7ae5e5ae3cb7eb9f258 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 19:42:19 +0200
Subject: [PATCH 08/35] Bump redis

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5829f726d..afcd5250f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
-gem "redis", "4.5.1"
+gem "redis", "4.7.0"
 gem "sidekiq", "6.2.2"
 
 # Scheduled processing
diff --git a/Gemfile.lock b/Gemfile.lock
index b782db82f..4ed43a957 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -612,7 +612,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    redis (4.5.1)
+    redis (4.7.0)
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -898,7 +898,7 @@ DEPENDENCIES
   rails-i18n (= 5.1.3)
   rails-timeago (= 2.19.1)
   redcarpet (= 3.5.1)
-  redis (= 4.5.1)
+  redis (= 4.7.0)
   responders (= 3.0.1)
   rqrcode (= 2.1.1)
   rspec-json_expectations (~> 2.1)

From 8c4381c1cefe1f380e3feb567fd219459e021665 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 19:53:47 +0200
Subject: [PATCH 09/35] Bump sidekiq and sidekiq-cron

---
 Gemfile            |  4 ++--
 Gemfile.lock       | 16 ++++++++--------
 config/sidekiq.yml |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index afcd5250f..35820e9ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,11 +38,11 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 # Background processing
 
 gem "redis", "4.7.0"
-gem "sidekiq", "6.2.2"
+gem "sidekiq", "6.4.2"
 
 # Scheduled processing
 
-gem "sidekiq-cron", "1.2.0"
+gem "sidekiq-cron", "1.4.0"
 
 # Compression
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ed43a957..1dc3f3ff6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -234,7 +234,7 @@ GEM
       execjs
       multi_json (>= 1.3)
       rake
-    et-orbi (1.2.6)
+    et-orbi (1.2.7)
       tzinfo
     ethon (0.15.0)
       ffi (>= 1.15.0)
@@ -284,8 +284,8 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.3.0)
-    fugit (1.5.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.5.3)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
@@ -682,12 +682,12 @@ GEM
     secure_headers (6.3.3)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.2.2)
+    sidekiq (6.4.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-cron (1.2.0)
-      fugit (~> 1.1)
+    sidekiq-cron (1.4.0)
+      fugit (~> 1)
       sidekiq (>= 4.2.1)
     simple_captcha2 (0.5.0)
       rails (>= 4.1)
@@ -910,8 +910,8 @@ DEPENDENCIES
   sass-rails (= 5.0.7)
   secure_headers (= 6.3.3)
   shoulda-matchers (= 4.5.1)
-  sidekiq (= 6.2.2)
-  sidekiq-cron (= 1.2.0)
+  sidekiq (= 6.4.2)
+  sidekiq-cron (= 1.4.0)
   simple_captcha2 (= 0.5.0)
   simplecov (= 0.21.2)
   sinon-rails (= 1.15.0)
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index a99dd69c9..4ad8c3920 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,4 +1,4 @@
-<% require_relative 'config/load_config' %>
+<% require_relative 'load_config' %>
 ---
 :verbose: false
 <% unless AppConfig.heroku? %>

From d97ff9afce6076bd857896fc2ca1e509443b4649 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:04:41 +0200
Subject: [PATCH 10/35] Bump terser

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 35820e9ad..1ea67854e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem "sidekiq-cron", "1.4.0"
 
 # Compression
 
-gem "terser", "1.1.7"
+gem "terser", "1.1.10"
 
 # Configuration
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1dc3f3ff6..c59d11fd0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -721,7 +721,7 @@ GEM
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    terser (1.1.7)
+    terser (1.1.10)
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
     thread_safe (0.3.6)
@@ -917,7 +917,7 @@ DEPENDENCIES
   sinon-rails (= 1.15.0)
   sprockets-rails (= 3.2.2)
   string-direction (= 1.2.2)
-  terser (= 1.1.7)
+  terser (= 1.1.10)
   timecop (= 0.9.4)
   toml-rb (= 2.1.0)
   turbo_dev_assets (= 0.0.2)

From dc1ec7665bea455de522a79bb0e59a18c05d2b71 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:05:55 +0200
Subject: [PATCH 11/35] Bump toml-rb

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1ea67854e..82808e9f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ gem "terser", "1.1.10"
 # Configuration
 
 gem "configurate", "0.5.0"
-gem "toml-rb", "2.1.0"
+gem "toml-rb", "2.1.2"
 
 # Cross-origin resource sharing
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c59d11fd0..654a78b92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -728,7 +728,7 @@ GEM
     tilt (2.0.10)
     timecop (0.9.4)
     timers (4.3.3)
-    toml-rb (2.1.0)
+    toml-rb (2.1.2)
       citrus (~> 3.0, > 3.0)
     turbo_dev_assets (0.0.2)
     twitter (7.0.0)
@@ -919,7 +919,7 @@ DEPENDENCIES
   string-direction (= 1.2.2)
   terser (= 1.1.10)
   timecop (= 0.9.4)
-  toml-rb (= 2.1.0)
+  toml-rb (= 2.1.2)
   turbo_dev_assets (= 0.0.2)
   twitter (= 7.0.0)
   twitter-text (= 1.14.7)

From 077bac95c0c64703254e5b285bab441326048ecb Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:06:58 +0200
Subject: [PATCH 12/35] Bump autoprefixer-rails

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 82808e9f2..899a283fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
 
 # CSS
 
-gem "autoprefixer-rails",     "10.3.3.0"
+gem "autoprefixer-rails",     "10.4.7.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 "compass-rails",          "3.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 654a78b92..8dc0247c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
-    autoprefixer-rails (10.3.3.0)
+    autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     bcrypt (3.1.18)
     bindata (2.4.10)
@@ -800,7 +800,7 @@ DEPENDENCIES
   addressable (= 2.8.0)
   apparition (= 0.6.0)
   asset_sync (= 2.15.0)
-  autoprefixer-rails (= 10.3.3.0)
+  autoprefixer-rails (= 10.4.7.0)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)
   capybara (= 3.35.3)

From ca40ca202a40f8359f4bb053d32c6c699d58b662 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:12:40 +0200
Subject: [PATCH 13/35] Bump sprockets-rails

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 899a283fc..86bd3b6bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ 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 "compass-rails",          "3.1.0"
 gem "sass-rails",             "5.0.7"
-gem "sprockets-rails",        "3.2.2"
+gem "sprockets-rails",        "3.4.2"
 
 # Database
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8dc0247c6..f63d70a76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -703,9 +703,9 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.7)
     state_machines (0.5.0)
@@ -915,7 +915,7 @@ DEPENDENCIES
   simple_captcha2 (= 0.5.0)
   simplecov (= 0.21.2)
   sinon-rails (= 1.15.0)
-  sprockets-rails (= 3.2.2)
+  sprockets-rails (= 3.4.2)
   string-direction (= 1.2.2)
   terser (= 1.1.10)
   timecop (= 0.9.4)

From a5a0b28d393de440fa417a457bf37cd3156ca481 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:14:27 +0200
Subject: [PATCH 14/35] Bump mysql2

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 86bd3b6bd..760c6a0ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ gem "sprockets-rails",        "3.4.2"
 # Database
 
 group :mysql, optional: true do
-  gem "mysql2", "0.5.3"
+  gem "mysql2", "0.5.4"
 end
 group :postgresql, optional: true do
   gem "pg",     "1.2.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index f63d70a76..ffc9d8133 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -416,7 +416,7 @@ GEM
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mysql2 (0.5.3)
+    mysql2 (0.5.4)
     naught (1.1.0)
     nio4r (2.5.8)
     nokogiri (1.12.5)
@@ -848,7 +848,7 @@ DEPENDENCIES
   mini_magick (= 4.11.0)
   minitest
   mobile-fu (= 1.4.0)
-  mysql2 (= 0.5.3)
+  mysql2 (= 0.5.4)
   nokogiri (= 1.12.5)
   omniauth (= 2.0.4)
   omniauth-rails_csrf_protection (= 1.0.0)

From e096c96c443cd8b028cb28a25652a7b544b50e32 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:15:58 +0200
Subject: [PATCH 15/35] Bump pg

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 760c6a0ec..cc712f4bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,7 +72,7 @@ group :mysql, optional: true do
   gem "mysql2", "0.5.4"
 end
 group :postgresql, optional: true do
-  gem "pg",     "1.2.3"
+  gem "pg",     "1.4.1"
 end
 
 gem "activerecord-import", "1.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index ffc9d8133..3830a9034 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -470,7 +470,7 @@ GEM
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.4.1)
     phantomjs (2.1.1.0)
     pronto (0.11.0)
       gitlab (~> 4.4, >= 4.4.0)
@@ -857,7 +857,7 @@ DEPENDENCIES
   omniauth-wordpress (= 0.2.2)
   open_graph_reader (= 0.7.2)
   openid_connect (= 1.3.0)
-  pg (= 1.2.3)
+  pg (= 1.4.1)
   pronto (= 0.11.0)
   pronto-eslint (= 0.11.0)
   pronto-haml (= 0.11.0)

From 5238bb4c5d8ecf40803028a7ab9d0f9c24b3eb1c Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:17:31 +0200
Subject: [PATCH 16/35] Bump activerecord-import

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index cc712f4bf..b1647c58b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,7 +75,7 @@ group :postgresql, optional: true do
   gem "pg",     "1.4.1"
 end
 
-gem "activerecord-import", "1.1.0"
+gem "activerecord-import", "1.4.0"
 
 # File uploading
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3830a9034..223281003 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,8 +37,8 @@ GEM
       activemodel (= 5.2.8)
       activesupport (= 5.2.8)
       arel (>= 9.0)
-    activerecord-import (1.1.0)
-      activerecord (>= 3.2)
+    activerecord-import (1.4.0)
+      activerecord (>= 4.2)
     activestorage (5.2.8)
       actionpack (= 5.2.8)
       activerecord (= 5.2.8)
@@ -794,7 +794,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers (= 0.9.7)
-  activerecord-import (= 1.1.0)
+  activerecord-import (= 1.4.0)
   acts-as-taggable-on (= 8.1.0)
   acts_as_api (= 1.0.1)
   addressable (= 2.8.0)

From 8ccf94a5875b4c83e24c1f95f55be9c761e0a49f Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:18:55 +0200
Subject: [PATCH 17/35] Bump fog-aws

---
 Gemfile      |  2 +-
 Gemfile.lock | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index b1647c58b..648f91cde 100644
--- a/Gemfile
+++ b/Gemfile
@@ -80,7 +80,7 @@ gem "activerecord-import", "1.4.0"
 # File uploading
 
 gem "carrierwave", "2.2.2"
-gem "fog-aws",     "3.12.0"
+gem "fog-aws",     "3.14.0"
 gem "mini_magick", "4.11.0"
 
 # GUID generation
diff --git a/Gemfile.lock b/Gemfile.lock
index 223281003..68d452644 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -238,7 +238,7 @@ GEM
       tzinfo
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.88.0)
+    excon (0.92.3)
     execjs (2.8.1)
     eye (0.10.0)
       celluloid (~> 0.17.3)
@@ -267,15 +267,14 @@ GEM
       activerecord (>= 2)
       activesupport (>= 2)
       hashdiff
-    fog-aws (3.12.0)
+    fog-aws (3.14.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (2.2.4)
+    fog-core (2.3.0)
       builder
       excon (~> 0.71)
-      formatador (~> 0.2)
+      formatador (>= 0.2, < 2.0)
       mime-types
     fog-json (1.2.0)
       fog-core
@@ -283,7 +282,7 @@ GEM
     fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.3.0)
+    formatador (1.1.0)
     fugit (1.5.3)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -348,7 +347,6 @@ GEM
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    ipaddress (0.8.3)
     jasmine (3.10.0)
       jasmine-core (~> 3.10.0)
       phantomjs
@@ -402,9 +400,9 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
@@ -825,7 +823,7 @@ DEPENDENCIES
   faraday-cookie_jar (= 0.0.7)
   faraday_middleware (= 0.14.0)
   fixture_builder (= 0.5.2)
-  fog-aws (= 3.12.0)
+  fog-aws (= 3.14.0)
   fuubar (= 2.5.1)
   gon (= 6.4.0)
   haml_lint (= 0.37.1)

From c0450cbe9d89dea064c8fb6208c8936bffd1b55d Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Jun 2022 20:25:03 +0200
Subject: [PATCH 18/35] Bump js-routes

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 648f91cde..2542f59ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ gem "entypo-rails", "3.0.0"
 
 gem "handlebars_assets", "0.23.9"
 gem "jquery-rails",      "4.4.0"
-gem "js-routes",         "2.1.2"
+gem "js-routes",         "2.2.4"
 gem "js_image_paths",    "0.1.1"
 
 source "https://gems.diasporafoundation.org" do
diff --git a/Gemfile.lock b/Gemfile.lock
index 68d452644..9af64acd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,7 +359,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    js-routes (2.1.2)
+    js-routes (2.2.4)
       railties (>= 4)
     js_image_paths (0.1.1)
       rails (>= 4.0, < 6.0)
@@ -834,7 +834,7 @@ DEPENDENCIES
   jasmine (= 3.10.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.4.0)
-  js-routes (= 2.1.2)
+  js-routes (= 2.2.4)
   js_image_paths (= 0.1.1)
   json (= 2.6.2)
   json-schema (= 3.0.0)

From 1ba9416e22915a1f5ab2018ba6d772615f2aa530 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:03:36 +0200
Subject: [PATCH 19/35] Bump ruby-oembed

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2542f59ca..af33d945d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -146,7 +146,7 @@ gem "leaflet-rails",       "1.7.0"
 gem "nokogiri",          "1.12.5"
 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.15.0"
+gem "ruby-oembed",       "0.16.1"
 gem "twitter-text",      "1.14.7"
 
 # RTL support
diff --git a/Gemfile.lock b/Gemfile.lock
index 9af64acd6..d55b1b6e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -656,7 +656,7 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.90.0, < 2.0)
-    ruby-oembed (0.15.0)
+    ruby-oembed (0.16.1)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.3)
       ffi (~> 1.12)
@@ -903,7 +903,7 @@ DEPENDENCIES
   rspec-rails (= 5.0.2)
   rubocop (= 0.93.1)
   rubocop-rails (= 2.9.1)
-  ruby-oembed (= 0.15.0)
+  ruby-oembed (= 0.16.1)
   rubyzip (= 2.3.2)
   sass-rails (= 5.0.7)
   secure_headers (= 6.3.3)

From aa0ac5bec67bf7decd634c6594b6742ca51fd59c Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:05:22 +0200
Subject: [PATCH 20/35] Bump omniauth and omniauth-rails_csrf_protection

---
 Gemfile      |  4 ++--
 Gemfile.lock | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index af33d945d..ce7deb832 100644
--- a/Gemfile
+++ b/Gemfile
@@ -159,8 +159,8 @@ gem "secure_headers", "6.3.3"
 
 # Services
 
-gem "omniauth",                       "2.0.4"
-gem "omniauth-rails_csrf_protection", "1.0.0"
+gem "omniauth",                       "2.1.0"
+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"
diff --git a/Gemfile.lock b/Gemfile.lock
index d55b1b6e1..76d01ee36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
       sprockets (>= 2.0.0)
       tilt (>= 1.2)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -430,9 +430,9 @@ GEM
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (2.0.4)
+    omniauth (2.1.0)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
     omniauth-oauth (1.2.0)
       oauth
@@ -440,7 +440,7 @@ GEM
     omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
-    omniauth-rails_csrf_protection (1.0.0)
+    omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-tumblr (1.2)
@@ -515,7 +515,7 @@ GEM
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
     rack-piwik (0.3.0)
-    rack-protection (2.1.0)
+    rack-protection (2.2.0)
       rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
@@ -848,8 +848,8 @@ DEPENDENCIES
   mobile-fu (= 1.4.0)
   mysql2 (= 0.5.4)
   nokogiri (= 1.12.5)
-  omniauth (= 2.0.4)
-  omniauth-rails_csrf_protection (= 1.0.0)
+  omniauth (= 2.1.0)
+  omniauth-rails_csrf_protection (= 1.0.1)
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)
   omniauth-wordpress (= 0.2.2)

From 61a560a58d29c823c8b70aa1255635f11d939aad Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:11:09 +0200
Subject: [PATCH 21/35] Bump active_model_serializers

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index ce7deb832..093256e92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -171,7 +171,7 @@ gem "openid_connect", "1.3.0"
 
 # Serializers
 
-gem "active_model_serializers", "0.9.7"
+gem "active_model_serializers", "0.9.8"
 
 # XMPP chat dependencies
 gem "diaspora-prosody-config",    "0.0.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 76d01ee36..f3028fa10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,7 +25,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.9.7)
+    active_model_serializers (0.9.8)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
     activejob (5.2.8)
@@ -791,7 +791,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_model_serializers (= 0.9.7)
+  active_model_serializers (= 0.9.8)
   activerecord-import (= 1.4.0)
   acts-as-taggable-on (= 8.1.0)
   acts_as_api (= 1.0.1)

From 796047f543a4507c449ecd45b168f852a80c45db Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:15:02 +0200
Subject: [PATCH 22/35] Bump faraday

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 093256e92..ee8e24798 100644
--- a/Gemfile
+++ b/Gemfile
@@ -184,7 +184,7 @@ gem "acts-as-taggable-on", "8.1.0"
 # URIs and HTTP
 
 gem "addressable",        "2.8.0", require: "addressable/uri"
-gem "faraday",            "0.17.4"
+gem "faraday",            "0.17.5"
 gem "faraday-cookie_jar", "0.0.7"
 gem "faraday_middleware", "0.14.0"
 gem "typhoeus",           "1.4.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index f3028fa10..f691dc1c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,7 +252,7 @@ GEM
     factory_girl_rails (4.9.0)
       factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
-    faraday (0.17.4)
+    faraday (0.17.5)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -413,7 +413,7 @@ GEM
     multi_json (1.15.0)
     multi_test (0.1.2)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     mysql2 (0.5.4)
     naught (1.1.0)
     nio4r (2.5.8)
@@ -819,7 +819,7 @@ DEPENDENCIES
   entypo-rails (= 3.0.0)
   eye (= 0.10.0)
   factory_girl_rails (= 4.9.0)
-  faraday (= 0.17.4)
+  faraday (= 0.17.5)
   faraday-cookie_jar (= 0.0.7)
   faraday_middleware (= 0.14.0)
   fixture_builder (= 0.5.2)

From 9189dbf3483d4b200332ac0cfdbbe35c6fc4932b Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:16:14 +0200
Subject: [PATCH 23/35] Bump hamlit

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index ee8e24798..4074260b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -192,7 +192,7 @@ gem "typhoeus",           "1.4.0"
 # Views
 
 gem "gon",                     "6.4.0"
-gem "hamlit",                  "2.15.1"
+gem "hamlit",                  "2.16.0"
 gem "mobile-fu",               "1.4.0"
 gem "rails-timeago",           "2.19.1"
 gem "will_paginate",           "3.3.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index f691dc1c2..51454285e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hamlit (2.15.1)
+    hamlit (2.16.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -827,7 +827,7 @@ DEPENDENCIES
   fuubar (= 2.5.1)
   gon (= 6.4.0)
   haml_lint (= 0.37.1)
-  hamlit (= 2.15.1)
+  hamlit (= 2.16.0)
   handlebars_assets (= 0.23.9)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)

From e3e7d2daab5d4df5cc594baf9167d941f533e771 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:17:09 +0200
Subject: [PATCH 24/35] Bump rails-timeago

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4074260b8..bb2ec6c7b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -194,7 +194,7 @@ gem "typhoeus",           "1.4.0"
 gem "gon",                     "6.4.0"
 gem "hamlit",                  "2.16.0"
 gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.19.1"
+gem "rails-timeago",           "2.20.0"
 gem "will_paginate",           "3.3.1"
 
 # Logging
diff --git a/Gemfile.lock b/Gemfile.lock
index 51454285e..4e2ed9262 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -594,9 +594,9 @@ GEM
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    rails-timeago (2.19.1)
-      actionpack (>= 3.1)
-      activesupport (>= 3.1)
+    rails-timeago (2.20.0)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
     railties (5.2.8)
       actionpack (= 5.2.8)
       activesupport (= 5.2.8)
@@ -894,7 +894,7 @@ DEPENDENCIES
   rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
   rails-controller-testing (= 1.0.5)
   rails-i18n (= 5.1.3)
-  rails-timeago (= 2.19.1)
+  rails-timeago (= 2.20.0)
   redcarpet (= 3.5.1)
   redis (= 4.7.0)
   responders (= 3.0.1)

From f044030db0c250d1e5b7f74fd5fa089943c23037 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:22:28 +0200
Subject: [PATCH 25/35] Fix version for minitest to 5.15.0

Newer versions don't support ruby 2.5 anymore, which we still use in CI
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index bb2ec6c7b..63ba43c9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -210,7 +210,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"
+gem "minitest",  "5.15.0"
 
 gem "versionist", "2.0.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e2ed9262..9bc5ce168 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -844,7 +844,7 @@ DEPENDENCIES
   markdown-it-html5-embed (= 1.0.0)
   markerb (= 1.1.0)
   mini_magick (= 4.11.0)
-  minitest
+  minitest (= 5.15.0)
   mobile-fu (= 1.4.0)
   mysql2 (= 0.5.4)
   nokogiri (= 1.12.5)

From 25f5236d6670330ce5d9eb523aca4b6b4e769c43 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:23:09 +0200
Subject: [PATCH 26/35] Bump asset_sync

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 63ba43c9a..ac3e43294 100644
--- a/Gemfile
+++ b/Gemfile
@@ -238,7 +238,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.0", require: false
+  gem "asset_sync", "2.15.2", require: false
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 9bc5ce168..70855a245 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
       capybara (~> 3.13, < 4)
       websocket-driver (>= 0.6.5)
     arel (9.0.0)
-    asset_sync (2.15.0)
+    asset_sync (2.15.2)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
@@ -748,7 +748,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
@@ -797,7 +797,7 @@ DEPENDENCIES
   acts_as_api (= 1.0.1)
   addressable (= 2.8.0)
   apparition (= 0.6.0)
-  asset_sync (= 2.15.0)
+  asset_sync (= 2.15.2)
   autoprefixer-rails (= 10.4.7.0)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)

From 7d7549e01ebe64c525c5248b188e182247ba1988 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:24:14 +0200
Subject: [PATCH 27/35] Bump haml_lint

---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index ac3e43294..4dd29e669 100644
--- a/Gemfile
+++ b/Gemfile
@@ -243,7 +243,7 @@ end
 
 group :development do
   # Linters
-  gem "haml_lint",      "0.37.1", require: false
+  gem "haml_lint",      "0.40.0", require: false
   gem "pronto",         "0.11.0", require: false
   gem "pronto-eslint",  "0.11.0", require: false
   gem "pronto-haml",    "0.11.0", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 70855a245..c44873d8a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.37.1)
+    haml_lint (0.40.0)
       haml (>= 4.0, < 5.3)
       parallel (~> 1.10)
       rainbow
@@ -465,8 +465,8 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.4.1)
     phantomjs (2.1.1.0)
@@ -603,7 +603,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     raindrops (0.20.0)
     rake (12.3.3)
     rb-fsevent (0.11.0)
@@ -611,7 +611,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.1)
     redis (4.7.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
@@ -650,8 +650,8 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     rubocop-rails (2.9.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
@@ -826,7 +826,7 @@ DEPENDENCIES
   fog-aws (= 3.14.0)
   fuubar (= 2.5.1)
   gon (= 6.4.0)
-  haml_lint (= 0.37.1)
+  haml_lint (= 0.40.0)
   hamlit (= 2.16.0)
   handlebars_assets (= 0.23.9)
   http_accept_language (= 2.1.1)

From a1b62094153c17cde31cbdaf492fbbccacc25983 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:25:21 +0200
Subject: [PATCH 28/35] Bump pronto-haml

---
 Gemfile      |  2 +-
 Gemfile.lock | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4dd29e669..9e7ab7ee8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -246,7 +246,7 @@ group :development do
   gem "haml_lint",      "0.40.0", require: false
   gem "pronto",         "0.11.0", require: false
   gem "pronto-eslint",  "0.11.0", require: false
-  gem "pronto-haml",    "0.11.0", 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
   gem "rubocop",        "0.93.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index c44873d8a..fd172d157 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,9 +291,9 @@ GEM
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    gitlab (4.17.0)
+    gitlab (4.18.0)
       httparty (~> 0.18)
-      terminal-table (~> 1.5, >= 1.5.1)
+      terminal-table (>= 1.5.1)
     globalid (1.0.0)
       activesupport (>= 5.0)
     gon (6.4.0)
@@ -427,7 +427,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.21.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (2.1.0)
@@ -481,10 +481,9 @@ GEM
     pronto-eslint (0.11.0)
       eslintrb (~> 2.0, >= 2.0.0)
       pronto (~> 0.11.0)
-    pronto-haml (0.11.0)
+    pronto-haml (0.11.1)
       haml_lint (~> 0.23)
       pronto (~> 0.11.0)
-      rubocop (< 1.0)
     pronto-rubocop (0.11.1)
       pronto (~> 0.11.0)
       rubocop (>= 0.63.1, < 2.0)
@@ -717,8 +716,8 @@ GEM
     sysexits (1.2.0)
     systemu (2.6.5)
     temple (0.8.2)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     terser (1.1.10)
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
@@ -858,7 +857,7 @@ DEPENDENCIES
   pg (= 1.4.1)
   pronto (= 0.11.0)
   pronto-eslint (= 0.11.0)
-  pronto-haml (= 0.11.0)
+  pronto-haml (= 0.11.1)
   pronto-rubocop (= 0.11.1)
   pronto-scss (= 0.11.0)
   pry

From 47d0269043d1d4a02992ce43fda5cc96a04c22f8 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:30:20 +0200
Subject: [PATCH 29/35] Bump listen

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e7ab7ee8..c94bd6143 100644
--- a/Gemfile
+++ b/Gemfile
@@ -261,7 +261,7 @@ group :development do
 
   gem "turbo_dev_assets", "0.0.2"
 
-  gem "listen", "3.5.1"
+  gem "listen", "3.7.1"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index fd172d157..d3e4e3a89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -259,7 +259,7 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -378,7 +378,7 @@ GEM
     kostya-sigar (2.0.10)
     leaflet-rails (1.7.0)
       rails (>= 4.2.0)
-    listen (3.5.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
@@ -605,7 +605,7 @@ GEM
     rainbow (3.1.1)
     raindrops (0.20.0)
     rake (12.3.3)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
@@ -838,7 +838,7 @@ DEPENDENCIES
   json (= 2.6.2)
   json-schema (= 3.0.0)
   leaflet-rails (= 1.7.0)
-  listen (= 3.5.1)
+  listen (= 3.7.1)
   logging-rails (= 0.6.0)
   markdown-it-html5-embed (= 1.0.0)
   markerb (= 1.1.0)

From b48c72f18865ab8f305528abe64811e83002f103 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:32:43 +0200
Subject: [PATCH 30/35] Bump timecop

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c94bd6143..9d1725147 100644
--- a/Gemfile
+++ b/Gemfile
@@ -283,7 +283,7 @@ group :test do
 
   gem "factory_girl_rails", "4.9.0"
   gem "shoulda-matchers",   "4.5.1"
-  gem "timecop",            "0.9.4"
+  gem "timecop",            "0.9.5"
   gem "webmock",            "3.14.0", require: false
 
   gem "diaspora_federation-test", "0.2.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index d3e4e3a89..6c0074f19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -723,7 +723,7 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timecop (0.9.4)
+    timecop (0.9.5)
     timers (4.3.3)
     toml-rb (2.1.2)
       citrus (~> 3.0, > 3.0)
@@ -915,7 +915,7 @@ DEPENDENCIES
   sprockets-rails (= 3.4.2)
   string-direction (= 1.2.2)
   terser (= 1.1.10)
-  timecop (= 0.9.4)
+  timecop (= 0.9.5)
   toml-rb (= 2.1.2)
   turbo_dev_assets (= 0.0.2)
   twitter (= 7.0.0)

From 86f306fce850609109f3cabf4d999c1897a178cd Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:33:50 +0200
Subject: [PATCH 31/35] Bump rspec-rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9d1725147..3520dd7b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -291,7 +291,7 @@ end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "5.0.2"
+  gem "rspec-rails", "5.1.2"
 
   # Cucumber (integration tests)
   gem "cucumber-rails", "2.4.0", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c0074f19..39a1f55c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -221,7 +221,7 @@ GEM
       diaspora_federation (= 0.2.7)
       fabrication (~> 2.16)
       uuid (~> 2.3, >= 2.3.8)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -622,16 +622,16 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-json_expectations (2.2.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -639,7 +639,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
+    rspec-support (3.11.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -899,7 +899,7 @@ DEPENDENCIES
   responders (= 3.0.1)
   rqrcode (= 2.1.1)
   rspec-json_expectations (~> 2.1)
-  rspec-rails (= 5.0.2)
+  rspec-rails (= 5.1.2)
   rubocop (= 0.93.1)
   rubocop-rails (= 2.9.1)
   ruby-oembed (= 0.16.1)

From 6753761c74b7ae009026d0e8b57c44561cfe1aa2 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:34:59 +0200
Subject: [PATCH 32/35] Bump cucumber-rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3520dd7b0..6c4c3c883 100644
--- a/Gemfile
+++ b/Gemfile
@@ -294,7 +294,7 @@ group :development, :test do
   gem "rspec-rails", "5.1.2"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "2.4.0", require: false
+  gem "cucumber-rails", "2.5.1", require: false
 
   # Jasmine (client side application tests (JS))
   gem "chrome_remote",             "0.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 39a1f55c9..b3658d1c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -161,11 +161,11 @@ GEM
     cucumber-api-steps (0.14.0)
       cucumber (>= 2.0.2)
       jsonpath (>= 0.1.2)
-    cucumber-core (10.1.0)
+    cucumber-core (10.1.1)
       cucumber-gherkin (~> 22.0, >= 22.0.0)
       cucumber-messages (~> 17.1, >= 17.1.1)
-      cucumber-tag-expressions (~> 4.0, >= 4.0.2)
-    cucumber-create-meta (6.0.2)
+      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)
@@ -174,19 +174,18 @@ GEM
     cucumber-html-formatter (17.0.0)
       cucumber-messages (~> 17.1, >= 17.1.0)
     cucumber-messages (17.1.1)
-    cucumber-rails (2.4.0)
+    cucumber-rails (2.5.1)
       capybara (>= 2.18, < 4)
       cucumber (>= 3.2, < 8)
       mime-types (~> 3.3)
       nokogiri (~> 1.10)
-      railties (>= 5.0, < 7)
+      railties (>= 5.0, < 8)
       rexml (~> 3.0)
       webrick (~> 1.7)
     cucumber-tag-expressions (4.1.0)
-    cucumber-wire (6.2.0)
+    cucumber-wire (6.2.1)
       cucumber-core (~> 10.1, >= 10.1.0)
       cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
-      cucumber-messages (~> 17.1, >= 17.1.1)
     database_cleaner-active_record (2.0.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
@@ -806,7 +805,7 @@ DEPENDENCIES
   compass-rails (= 3.1.0)
   configurate (= 0.5.0)
   cucumber-api-steps (= 0.14)
-  cucumber-rails (= 2.4.0)
+  cucumber-rails (= 2.5.1)
   database_cleaner-active_record (= 2.0.1)
   devise (= 4.8.1)
   devise-two-factor (= 4.0.2)

From 9b23411d25e9c80a72544ea110915562433d9922 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 02:44:48 +0200
Subject: [PATCH 33/35] Add rails-assets-bootstrap to
 gems.diasporafoundation.org source block

this prevents a warning because somebody also uploaded an old version of
this to rubygems.org
---
 Gemfile      | 1 +
 Gemfile.lock | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index 6c4c3c883..b3b1d49e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,6 +112,7 @@ source "https://gems.diasporafoundation.org" do
   gem "rails-assets-markdown-it-sup",                     "1.0.0"
 
   gem "rails-assets-backbone",                            "1.3.3"
+  gem "rails-assets-bootstrap",                           "3.4.1"
   gem "rails-assets-bootstrap-markdown",                  "2.10.0"
   gem "rails-assets-corejs-typeahead",                    "1.2.1"
   gem "rails-assets-fine-uploader",                       "5.13.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index b3658d1c5..4d02406ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -870,6 +870,7 @@ DEPENDENCIES
   rails-assets-autosize (= 4.0.2)!
   rails-assets-backbone (= 1.3.3)!
   rails-assets-blueimp-gallery (= 2.33.0)!
+  rails-assets-bootstrap (= 3.4.1)!
   rails-assets-bootstrap-markdown (= 2.10.0)!
   rails-assets-corejs-typeahead (= 1.2.1)!
   rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!

From edbb26b9265003bcdf1a5b92d0f5132c17d5be00 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 03:00:34 +0200
Subject: [PATCH 34/35] 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 4d02406ca..934292d7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -324,7 +324,7 @@ GEM
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
@@ -343,7 +343,7 @@ GEM
       actionpack (>= 3.0.0)
       i18n-inflector (~> 2.6)
       railties (>= 3.0.0)
-    image_processing (1.12.1)
+    image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     jasmine (3.10.0)
@@ -370,9 +370,9 @@ GEM
       bindata
     json-schema (3.0.0)
       addressable (>= 2.8)
-    jsonpath (1.1.0)
+    jsonpath (1.1.2)
       multi_json
-    jwt (2.3.0)
+    jwt (2.4.1)
     kgio (2.11.4)
     kostya-sigar (2.0.10)
     leaflet-rails (1.7.0)
@@ -381,7 +381,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     logging-rails (0.6.0)
@@ -419,13 +419,14 @@ GEM
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    oauth (0.5.7)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth (0.5.10)
+    oauth2 (2.0.2)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       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)
@@ -436,9 +437,9 @@ GEM
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
@@ -604,13 +605,15 @@ GEM
     rainbow (3.1.1)
     raindrops (0.20.0)
     rake (12.3.3)
+    rash_alt (0.4.12)
+      hashie (>= 3.4)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
     redis (4.7.0)
     regexp_parser (2.5.0)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -656,7 +659,7 @@ GEM
       rubocop (>= 0.90.0, < 2.0)
     ruby-oembed (0.16.1)
     ruby-progressbar (1.11.0)
-    ruby-vips (2.1.3)
+    ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
     rugged (1.0.1)
@@ -693,7 +696,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     sinon-rails (1.15.0)
       railties (>= 3.1)
     sprockets (3.7.2)
@@ -760,9 +763,10 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.13)
+    validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
+    version_gem (1.1.0)
     versionist (2.0.1)
       activesupport (>= 3)
       railties (>= 3)
@@ -783,7 +787,8 @@ GEM
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.26)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby

From 3ff162320ef465cf2a0ee88303a63db33d8b454b Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 27 Jun 2022 03:21:28 +0200
Subject: [PATCH 35/35] Bump rails-assets-jquery and jquery-rails

---
 Gemfile      | 4 ++--
 Gemfile.lock | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index b3b1d49e1..57a0e6c1f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,12 +93,12 @@ gem "entypo-rails", "3.0.0"
 # JavaScript
 
 gem "handlebars_assets", "0.23.9"
-gem "jquery-rails",      "4.4.0"
+gem "jquery-rails",      "4.5.0"
 gem "js-routes",         "2.2.4"
 gem "js_image_paths",    "0.1.1"
 
 source "https://gems.diasporafoundation.org" do
-  gem "rails-assets-jquery",                              "3.5.1" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery",                              "3.6.0" # Should be kept in sync with jquery-rails
   gem "rails-assets-jquery.ui",                           "1.11.4"
 
   gem "rails-assets-highlightjs",                         "9.12.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 934292d7b..6e1f22525 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,7 +354,7 @@ GEM
       webrick
     jasmine-core (3.10.1)
     jasmine-jquery-rails (2.0.3)
-    jquery-rails (4.4.0)
+    jquery-rails (4.5.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -558,7 +558,7 @@ GEM
     rails-assets-jasmine (3.4.0)
     rails-assets-jasmine-ajax (4.0.0)
       rails-assets-jasmine (~> 3)
-    rails-assets-jquery (3.5.1)
+    rails-assets-jquery (3.6.0)
     rails-assets-jquery-colorbox (1.6.4)
       rails-assets-jquery (>= 1.3.2)
     rails-assets-jquery-fullscreen-plugin (0.5.0)
@@ -836,7 +836,7 @@ DEPENDENCIES
   i18n-inflector-rails (= 1.0.7)
   jasmine (= 3.10.0)
   jasmine-jquery-rails (= 2.0.3)
-  jquery-rails (= 4.4.0)
+  jquery-rails (= 4.5.0)
   js-routes (= 2.2.4)
   js_image_paths (= 0.1.1)
   json (= 2.6.2)
@@ -882,7 +882,7 @@ DEPENDENCIES
   rails-assets-fine-uploader (= 5.13.0)!
   rails-assets-highlightjs (= 9.12.0)!
   rails-assets-jasmine-ajax (= 4.0.0)!
-  rails-assets-jquery (= 3.5.1)!
+  rails-assets-jquery (= 3.6.0)!
   rails-assets-jquery-placeholder (= 2.3.1)!
   rails-assets-jquery-textchange (= 0.2.3)!
   rails-assets-jquery.are-you-sure (= 1.9.0)!