From cd9f79a01888be76987e1589583da8884188b07b Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 16 Sep 2020 23:50:40 +0530
Subject: [PATCH 01/22] Update rubyzip from 1.3.0 to 2.3.0

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

diff --git a/Gemfile b/Gemfile
index 2a53b6ddb..19903cd71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -202,7 +202,7 @@ gem "logging-rails", "0.6.0", require: "logging/rails"
 
 # Reading and writing zip files
 
-gem "rubyzip", "1.3.0", require: "zip"
+gem "rubyzip", "2.3.0", require: "zip"
 
 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs:
diff --git a/Gemfile.lock b/Gemfile.lock
index f96686cb5..92ab90a58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -656,7 +656,7 @@ GEM
       rubocop (>= 0.72.0)
     ruby-oembed (0.12.0)
     ruby-progressbar (1.10.1)
-    rubyzip (1.3.0)
+    rubyzip (2.3.0)
     rugged (0.99.0)
     safe_yaml (1.0.5)
     sass (3.4.25)
@@ -902,7 +902,7 @@ DEPENDENCIES
   rubocop (= 0.80.1)
   rubocop-rails (= 2.4.1)
   ruby-oembed (= 0.12.0)
-  rubyzip (= 1.3.0)
+  rubyzip (= 2.3.0)
   sass-rails (= 5.0.7)
   secure_headers (= 6.3.0)
   shoulda-matchers (= 4.0.1)

From 18ea3343fdae9d0ba1cd44d9f070ecefc7d77167 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 17 Sep 2020 00:20:03 +0530
Subject: [PATCH 02/22] Update typhoeus 1.3.1 -> 1.4.0

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

diff --git a/Gemfile b/Gemfile
index 19903cd71..01089e9df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -186,7 +186,7 @@ gem "addressable",        "2.7.0", require: "addressable/uri"
 gem "faraday",            "0.15.4"
 gem "faraday_middleware", "0.13.1"
 gem "faraday-cookie_jar", "0.0.6"
-gem "typhoeus",           "1.3.1"
+gem "typhoeus",           "1.4.0"
 
 # Views
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 92ab90a58..35764e08f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -736,7 +736,7 @@ GEM
       simple_oauth (~> 0.3.0)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
@@ -918,7 +918,7 @@ DEPENDENCIES
   turbo_dev_assets (= 0.0.2)
   twitter (= 7.0.0)
   twitter-text (= 1.14.7)
-  typhoeus (= 1.3.1)
+  typhoeus (= 1.4.0)
   uglifier (= 4.2.0)
   unicorn (= 5.5.3)
   unicorn-worker-killer (= 0.4.4)

From 4c6937838dd7276253ab9c69cea3b70549757833 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 17 Sep 2020 00:51:33 +0530
Subject: [PATCH 03/22] Update responders 2.4.1 -> 3.0.1

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

diff --git a/Gemfile b/Gemfile
index 01089e9df..81c90102a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "rails", "5.2.4.3"
 
 # Legacy Rails features, remove me!
 # responders (class level)
-gem "responders", "2.4.1"
+gem "responders", "3.0.1"
 
 # Appserver
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 35764e08f..173fffb9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -612,9 +612,9 @@ GEM
     regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
+    responders (3.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
     rexml (3.2.4)
     rotp (2.1.2)
     rqrcode (1.1.2)
@@ -895,7 +895,7 @@ DEPENDENCIES
   rb-inotify (= 0.10.1)
   redcarpet (= 3.5.0)
   redis (= 3.3.5)
-  responders (= 2.4.1)
+  responders (= 3.0.1)
   rqrcode (= 1.1.2)
   rspec-json_expectations (~> 2.1)
   rspec-rails (= 3.9.1)

From cb675f5c8d138d8936e7f1e8c3b363face8f9759 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 17 Sep 2020 01:18:09 +0530
Subject: [PATCH 04/22] Update bootstrap-switch-rails 3.3.3 -> 3.3.5

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

diff --git a/Gemfile b/Gemfile
index 81c90102a..1bb364cf7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
 
 gem "autoprefixer-rails",     "8.6.5"
 gem "bootstrap-sass",         "3.4.1"
-gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
+gem "bootstrap-switch-rails", "3.3.5"
 gem "compass-rails",          "3.1.0"
 gem "sass-rails",             "5.0.7"
 gem "sprockets-rails",        "3.2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 173fffb9e..020c7a3d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
-    bootstrap-switch-rails (3.3.3)
+    bootstrap-switch-rails (3.3.5)
     buftok (0.2.0)
     builder (3.2.4)
     byebug (11.1.1)
@@ -795,7 +795,7 @@ DEPENDENCIES
   asset_sync (= 2.11.0)
   autoprefixer-rails (= 8.6.5)
   bootstrap-sass (= 3.4.1)
-  bootstrap-switch-rails (= 3.3.3)
+  bootstrap-switch-rails (= 3.3.5)
   capybara (= 3.15.0)
   carrierwave (= 1.3.1)
   chrome_remote (= 0.3.0)

From ee35ad3200b62452ce33a127ca25755e3ef5419e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 14:19:35 +0200
Subject: [PATCH 05/22] update devise-two-factor to 4.0.0

---
 Gemfile            |  2 +-
 Gemfile.lock       | 12 ++++++------
 app/models/user.rb |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1bb364cf7..c5db59cee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem "json-schema", "2.8.1"
 # Authentication
 
 gem "devise", "4.7.1"
-gem "devise-two-factor", "3.0.3"
+gem "devise-two-factor", "4.0.0"
 gem "devise_lastseenable", "0.0.6"
 gem "rqrcode", "1.1.2"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 020c7a3d1..c1e691d1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -174,12 +174,12 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (3.0.3)
-      activesupport (< 5.3)
+    devise-two-factor (4.0.0)
+      activesupport (< 6.2)
       attr_encrypted (>= 1.3, < 4, != 2)
       devise (~> 4.0)
-      railties (< 5.3)
-      rotp (~> 2.0)
+      railties (< 6.2)
+      rotp (~> 6.0)
     devise_lastseenable (0.0.6)
       devise
       rails (>= 3.0.4)
@@ -616,7 +616,7 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.4)
-    rotp (2.1.2)
+    rotp (6.2.0)
     rqrcode (1.1.2)
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
@@ -805,7 +805,7 @@ DEPENDENCIES
   cucumber-rails (= 2.0.0)
   database_cleaner (= 1.8.3)
   devise (= 4.7.1)
-  devise-two-factor (= 3.0.3)
+  devise-two-factor (= 4.0.0)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
   diaspora_federation-json_schema (= 0.2.6)
diff --git a/app/models/user.rb b/app/models/user.rb
index 8ab4f9be6..bfc97325b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,6 +4,8 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require "attr_encrypted"
+
 class User < ApplicationRecord
   include AuthenticationToken
   include Connecting

From 8d7b866c87535f1aa82d23071a20136a3ae4ac5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 14:35:09 +0200
Subject: [PATCH 06/22] update secure_headers to 6.3.2

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

diff --git a/Gemfile b/Gemfile
index c5db59cee..c43e06f67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -155,7 +155,7 @@ gem "string-direction", "1.2.2"
 
 # Security Headers
 
-gem "secure_headers", "6.3.0"
+gem "secure_headers", "6.3.2"
 
 # Services
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c1e691d1a..aa273474f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -674,7 +674,7 @@ GEM
     scss_lint (0.55.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
-    secure_headers (6.3.0)
+    secure_headers (6.3.2)
     shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
@@ -904,7 +904,7 @@ DEPENDENCIES
   ruby-oembed (= 0.12.0)
   rubyzip (= 2.3.0)
   sass-rails (= 5.0.7)
-  secure_headers (= 6.3.0)
+  secure_headers (= 6.3.2)
   shoulda-matchers (= 4.0.1)
   sidekiq (= 5.2.8)
   sidekiq-cron (= 1.1.0)

From f52dbe570d8d4b3a5c0230c61d71ed4cac35d3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 14:39:46 +0200
Subject: [PATCH 07/22] Update autoprefixer-rails to 10.2.4.0

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

diff --git a/Gemfile b/Gemfile
index c43e06f67..4b3ab7131 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
 
 # CSS
 
-gem "autoprefixer-rails",     "8.6.5"
+gem "autoprefixer-rails",     "10.2.4.0"
 gem "bootstrap-sass",         "3.4.1"
 gem "bootstrap-switch-rails", "3.3.5"
 gem "compass-rails",          "3.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index aa273474f..65765520c 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 (8.6.5)
+    autoprefixer-rails (10.2.4.0)
       execjs
     backports (3.17.0)
     bcrypt (3.1.13)
@@ -793,7 +793,7 @@ DEPENDENCIES
   addressable (= 2.7.0)
   apparition (= 0.6.0)
   asset_sync (= 2.11.0)
-  autoprefixer-rails (= 8.6.5)
+  autoprefixer-rails (= 10.2.4.0)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.5)
   capybara (= 3.15.0)

From 62bb4dc7b66ea74ceb5e538f95d93a2619447778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 14:59:38 +0200
Subject: [PATCH 08/22] Update to Sidekiq 6

closes #8153
closes #8162
---
 Gemfile                        |  6 +++---
 Gemfile.lock                   | 33 ++++++++++++++---------------
 config/initializers/sidekiq.rb | 38 ++++++++--------------------------
 3 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4b3ab7131..e7fe314c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,12 +37,12 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
-gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
-gem "sidekiq", "5.2.8"
+gem "redis", "4.2.5"
+gem "sidekiq", "6.2.1"
 
 # Scheduled processing
 
-gem "sidekiq-cron", "1.1.0"
+gem "sidekiq-cron", "1.2.0"
 
 # Compression
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 65765520c..b4e4c40be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -138,7 +138,7 @@ GEM
       sprockets (< 4.0)
     concurrent-ruby (1.1.6)
     configurate (0.5.0)
-    connection_pool (2.2.2)
+    connection_pool (2.2.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -261,9 +261,9 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    fugit (1.3.3)
+    fugit (1.4.4)
       et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.1)
+      raabro (~> 1.4)
     fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -498,8 +498,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.3)
-    raabro (1.1.6)
-    rack (2.0.9)
+    raabro (1.4.0)
+    rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-google-analytics (1.2.0)
@@ -514,8 +514,6 @@ GEM
       json-jwt (>= 1.11.0)
       rack
     rack-piwik (0.3.0)
-    rack-protection (2.0.8.1)
-      rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
@@ -608,7 +606,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.0)
-    redis (3.3.5)
+    redis (4.2.5)
     regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -678,12 +676,11 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
-    sidekiq (5.2.8)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (< 2.1.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sidekiq-cron (1.1.0)
+    sidekiq (6.2.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    sidekiq-cron (1.2.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
     simple_captcha2 (0.5.0)
@@ -738,7 +735,7 @@ GEM
       unf (~> 0.1.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -894,7 +891,7 @@ DEPENDENCIES
   rb-fsevent (= 0.10.3)
   rb-inotify (= 0.10.1)
   redcarpet (= 3.5.0)
-  redis (= 3.3.5)
+  redis (= 4.2.5)
   responders (= 3.0.1)
   rqrcode (= 1.1.2)
   rspec-json_expectations (~> 2.1)
@@ -906,8 +903,8 @@ DEPENDENCIES
   sass-rails (= 5.0.7)
   secure_headers (= 6.3.2)
   shoulda-matchers (= 4.0.1)
-  sidekiq (= 5.2.8)
-  sidekiq-cron (= 1.1.0)
+  sidekiq (= 6.2.1)
+  sidekiq-cron (= 1.2.0)
   simple_captcha2 (= 0.5.0)
   simplecov (= 0.16.1)
   sinon-rails (= 1.15.0)
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 8f996504a..104e94a82 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'sidekiq_middlewares'
-require 'sidekiq/middleware/i18n'
+require "sidekiq_middlewares"
+require "sidekiq/middleware/i18n"
 
 # Single process-mode
-if AppConfig.environment.single_process_mode? && Rails.env != "test"
-  if Rails.env == 'production'
+if AppConfig.environment.single_process_mode? && !Rails.env.test?
+  if Rails.env.production?
     warn "WARNING: You are running Diaspora in production without Sidekiq"
     warn "         workers turned on.  Please set single_process_mode to false in"
     warn "         config/diaspora.toml."
   end
-  require 'sidekiq/testing/inline'
+  require "sidekiq/testing/inline"
 end
 
 Sidekiq.configure_server do |config|
@@ -20,35 +20,15 @@ Sidekiq.configure_server do |config|
     chain.add SidekiqMiddlewares::CleanAndShortBacktraces
   end
 
-  # Set connection pool on Heroku
-  database_url = ENV['DATABASE_URL']
-  if(database_url)
-    ENV['DATABASE_URL'] = "#{database_url}?pool=#{AppConfig.environment.sidekiq.concurrency.get}"
+  # Set connection pool to match concurrency
+  database_url = ENV["DATABASE_URL"]
+  if database_url
+    ENV["DATABASE_URL"] = "#{database_url}?pool=#{AppConfig.environment.sidekiq.concurrency.get}"
     ActiveRecord::Base.establish_connection
   end
 
   # Make sure each Sidekiq process has its own sequence of UUIDs
   UUID.generator.next_sequence
-
-  # wrap the logger to add the sidekiq job context to the log
-  class SidekiqLogger < SimpleDelegator
-    SPACE = " "
-
-    # only info is used with context
-    def info(data=nil)
-      return false if Logger::Severity::INFO < level
-      data = yield if data.nil? && block_given?
-      __getobj__.info("#{context}#{data}")
-    end
-
-    # from sidekiq/logging.rb
-    def context
-      c = Thread.current[:sidekiq_context]
-      "#{c.join(SPACE)}: " if c && c.any?
-    end
-  end
-
-  Sidekiq::Logging.logger = SidekiqLogger.new(Logging.logger[Sidekiq])
 end
 
 Sidekiq.configure_client do |config|

From aa51329a492c6adce1e1f75f86557902f2d2e722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 15:02:11 +0200
Subject: [PATCH 09/22] update to rails 5.2.5

---
 Gemfile      |  2 +-
 Gemfile.lock | 98 +++++++++++++++++++++++++---------------------------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/Gemfile b/Gemfile
index e7fe314c2..6ce48d738 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.4.3"
+gem "rails", "5.2.5"
 
 # Legacy Rails features, remove me!
 # responders (class level)
diff --git a/Gemfile.lock b/Gemfile.lock
index b4e4c40be..602351c0b 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.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.5)
+      actionpack (= 5.2.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailer (5.2.5)
+      actionpack (= 5.2.5)
+      actionview (= 5.2.5)
+      activejob (= 5.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.5)
+      actionview (= 5.2.5)
+      activesupport (= 5.2.5)
       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.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.5)
+      activesupport (= 5.2.5)
       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.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (5.2.5)
+      activesupport (= 5.2.5)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.5)
+      activesupport (= 5.2.5)
+    activerecord (5.2.5)
+      activemodel (= 5.2.5)
+      activesupport (= 5.2.5)
       arel (>= 9.0)
     activerecord-import (1.0.4)
       activerecord (>= 3.2)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activestorage (5.2.5)
+      actionpack (= 5.2.5)
+      activerecord (= 5.2.5)
+      marcel (~> 1.0.0)
+    activesupport (5.2.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -136,7 +136,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     configurate (0.5.0)
     connection_pool (2.2.3)
     crack (0.4.3)
@@ -206,7 +206,7 @@ GEM
     entypo-rails (3.0.0)
       railties (>= 4.1, < 6)
     equalizer (0.0.11)
-    erubi (1.9.0)
+    erubi (1.10.0)
     eslintrb (2.1.0)
       execjs
       multi_json (>= 1.3)
@@ -331,7 +331,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -385,7 +385,7 @@ GEM
       multi_json (~> 1.10)
     logging-rails (0.6.0)
       logging (>= 1.8)
-    loofah (2.5.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.4)
@@ -393,8 +393,7 @@ GEM
       systemu (~> 2.6.5)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     markdown-it-html5-embed (1.0.0)
     markerb (1.1.0)
     memoizable (0.4.2)
@@ -403,13 +402,10 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
     mini_magick (4.10.1)
-    mini_mime (1.0.2)
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     mobile-fu (1.4.0)
       rack-mobile-detect
       rails
@@ -420,7 +416,7 @@ GEM
     mysql2 (0.5.3)
     naught (1.1.0)
     nenv (0.3.0)
-    nio4r (2.5.2)
+    nio4r (2.5.7)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
@@ -519,18 +515,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (5.2.5)
+      actioncable (= 5.2.5)
+      actionmailer (= 5.2.5)
+      actionpack (= 5.2.5)
+      actionview (= 5.2.5)
+      activejob (= 5.2.5)
+      activemodel (= 5.2.5)
+      activerecord (= 5.2.5)
+      activestorage (= 5.2.5)
+      activesupport (= 5.2.5)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 5.2.5)
       sprockets-rails (>= 2.0.0)
     rails-assets-autosize (4.0.2)
     rails-assets-backbone (1.3.3)
@@ -593,9 +589,9 @@ GEM
     rails-timeago (2.18.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    railties (5.2.5)
+      actionpack (= 5.2.5)
+      activesupport (= 5.2.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -771,7 +767,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
@@ -862,7 +858,7 @@ DEPENDENCIES
   rack-piwik (= 0.3.0)
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
-  rails (= 5.2.4.3)
+  rails (= 5.2.5)
   rails-assets-autosize (= 4.0.2)!
   rails-assets-backbone (= 1.3.3)!
   rails-assets-blueimp-gallery (= 2.33.0)!

From 52f08f11789c725303c4d79a7bfe78f31d5133ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 15:04:51 +0200
Subject: [PATCH 10/22] update redcarpet to 3.5.1

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

diff --git a/Gemfile b/Gemfile
index 6ce48d738..274ca1a2d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -145,7 +145,7 @@ gem "leaflet-rails",       "1.6.0"
 
 gem "nokogiri",          "1.10.9"
 gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
-gem "redcarpet",         "3.5.0"
+gem "redcarpet",         "3.5.1"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "1.14.7"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 602351c0b..c67910843 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -601,7 +601,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redcarpet (3.5.0)
+    redcarpet (3.5.1)
     redis (4.2.5)
     regexp_parser (1.7.0)
     request_store (1.5.0)
@@ -886,7 +886,7 @@ DEPENDENCIES
   rails-timeago (= 2.18.0)
   rb-fsevent (= 0.10.3)
   rb-inotify (= 0.10.1)
-  redcarpet (= 3.5.0)
+  redcarpet (= 3.5.1)
   redis (= 4.2.5)
   responders (= 3.0.1)
   rqrcode (= 1.1.2)

From f55237ca6b6c15b663f88cbff0e0a3d08bf0fc71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 15:06:22 +0200
Subject: [PATCH 11/22] update nokogiri to 1.11.3

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

diff --git a/Gemfile b/Gemfile
index 274ca1a2d..9697fe636 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@ gem "leaflet-rails",       "1.6.0"
 
 # Parsing
 
-gem "nokogiri",          "1.10.9"
+gem "nokogiri",          "1.11.3"
 gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
 gem "redcarpet",         "3.5.1"
 gem "ruby-oembed",       "0.12.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index c67910843..432a5088c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
     mime-types-data (3.2019.1009)
     mini_magick (4.10.1)
     mini_mime (1.1.0)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.4)
     mobile-fu (1.4.0)
       rack-mobile-detect
@@ -417,8 +417,9 @@ GEM
     naught (1.1.0)
     nenv (0.3.0)
     nio4r (2.5.7)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -495,6 +496,7 @@ GEM
       pry (~> 0.10)
     public_suffix (4.0.3)
     raabro (1.4.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -838,7 +840,7 @@ DEPENDENCIES
   minitest
   mobile-fu (= 1.4.0)
   mysql2 (= 0.5.3)
-  nokogiri (= 1.10.9)
+  nokogiri (= 1.11.3)
   omniauth (= 1.9.1)
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)

From 7960a51d123c9419431730805790dc547f01c678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 15:09:05 +0200
Subject: [PATCH 12/22] update open_graph_reader to 0.7.1

---
 Gemfile                              | 2 +-
 Gemfile.lock                         | 4 ++--
 features/support/webmock.rb          | 2 +-
 spec/models/open_graph_cache_spec.rb | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9697fe636..f682da1d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -144,7 +144,7 @@ gem "leaflet-rails",       "1.6.0"
 # Parsing
 
 gem "nokogiri",          "1.11.3"
-gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
+gem "open_graph_reader", "0.7.1" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb
 gem "redcarpet",         "3.5.1"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "1.14.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 432a5088c..a0a585f6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -450,7 +450,7 @@ GEM
       rack
     omniauth-wordpress (0.2.2)
       omniauth-oauth2 (>= 1.1.0)
-    open_graph_reader (0.7.0)
+    open_graph_reader (0.7.1)
       faraday (>= 0.9.0)
       nokogiri (~> 1.6)
     openid_connect (1.1.8)
@@ -845,7 +845,7 @@ DEPENDENCIES
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)
   omniauth-wordpress (= 0.2.2)
-  open_graph_reader (= 0.7.0)
+  open_graph_reader (= 0.7.1)
   openid_connect (= 1.1.8)
   pg (= 1.2.3)
   pronto (= 0.10.0)
diff --git a/features/support/webmock.rb b/features/support/webmock.rb
index cce1de904..3068944d4 100644
--- a/features/support/webmock.rb
+++ b/features/support/webmock.rb
@@ -7,7 +7,7 @@ Before do
   stub_request(:head, /.+/).with(
     headers: {
       "Accept"     => "text/html",
-      "User-Agent" => "OpenGraphReader/0.7.0 (+https://github.com/jhass/open_graph_reader)"
+      "User-Agent" => "OpenGraphReader/0.7.1 (+https://github.com/jhass/open_graph_reader)"
     }
   ).to_return(status: 200, body: "", headers: {"Content-Type" => "text/plain"})
 end
diff --git a/spec/models/open_graph_cache_spec.rb b/spec/models/open_graph_cache_spec.rb
index 799f726ac..e205baa76 100644
--- a/spec/models/open_graph_cache_spec.rb
+++ b/spec/models/open_graph_cache_spec.rb
@@ -63,7 +63,7 @@ describe OpenGraphCache, type: :model do
         stub_request(:head, "http:///wetter.com")
           .with(headers: {
                   "Accept"     => "text/html",
-                  "User-Agent" => "OpenGraphReader/0.7.0 (+https://github.com/jhass/open_graph_reader)"
+                  "User-Agent" => "OpenGraphReader/0.7.1 (+https://github.com/jhass/open_graph_reader)"
                 })
           .to_return(status: 200, body: "", headers:
             {"Set-Cookie" => "Dabgroup=A;path=/;Expires=Thu, 23 May 2019 16:12:01 GMT;httpOnly"})

From 7277200bc5a2216f2421c03c5425327bbdc0e914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 15:10:06 +0200
Subject: [PATCH 13/22] update devise to 4.7.3

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

diff --git a/Gemfile b/Gemfile
index f682da1d7..ad1148860 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem "json-schema", "2.8.1"
 
 # Authentication
 
-gem "devise", "4.7.1"
+gem "devise", "4.7.3"
 gem "devise-two-factor", "4.0.0"
 gem "devise_lastseenable", "0.0.6"
 gem "rqrcode", "1.1.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index a0a585f6b..27818de7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,7 +73,7 @@ GEM
     autoprefixer-rails (10.2.4.0)
       execjs
     backports (3.17.0)
-    bcrypt (3.1.13)
+    bcrypt (3.1.16)
     bindata (2.4.6)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
@@ -168,7 +168,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     database_cleaner (1.8.3)
-    devise (4.7.1)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -760,8 +760,8 @@ GEM
       activesupport (>= 3)
       railties (>= 3)
       yard (~> 0.9.20)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
@@ -799,7 +799,7 @@ DEPENDENCIES
   cucumber-api-steps (= 0.14)
   cucumber-rails (= 2.0.0)
   database_cleaner (= 1.8.3)
-  devise (= 4.7.1)
+  devise (= 4.7.3)
   devise-two-factor (= 4.0.0)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)

From b4b4efbab124024370d9f27e5bdf791b2d9cde35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:23:30 +0200
Subject: [PATCH 14/22] drop guard dev tool

---
 Gemfile      |  7 -------
 Gemfile.lock | 31 -------------------------------
 Guardfile    | 29 -----------------------------
 bin/guard    | 16 ----------------
 4 files changed, 83 deletions(-)
 delete mode 100644 Guardfile
 delete mode 100755 bin/guard

diff --git a/Gemfile b/Gemfile
index ad1148860..d00735331 100644
--- a/Gemfile
+++ b/Gemfile
@@ -241,13 +241,6 @@ group :production do # we don"t install these on travis to speed up test runs
 end
 
 group :development do
-  # Automatic test runs
-  gem "guard",          "2.16.1", require: false
-  gem "guard-rspec",    "4.7.3", require: false
-  gem "guard-rubocop",  "1.3.0", require: false
-  gem "rb-fsevent",     "0.10.3", require: false
-  gem "rb-inotify",     "0.10.1", require: false
-
   # Linters
   gem "haml_lint",      "0.35.0", require: false
   gem "pronto",         "0.10.0", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 27818de7a..c3d942158 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -280,23 +280,6 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    guard (2.16.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
@@ -376,9 +359,6 @@ GEM
     kostya-sigar (2.0.8)
     leaflet-rails (1.6.0)
       rails (>= 4.2.0)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -388,7 +368,6 @@ GEM
     loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.2.4)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
     mail (2.7.1)
@@ -415,14 +394,10 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     naught (1.1.0)
-    nenv (0.3.0)
     nio4r (2.5.7)
     nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
     oauth (0.5.4)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
@@ -671,7 +646,6 @@ GEM
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
     secure_headers (6.3.2)
-    shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
     sidekiq (6.2.1)
@@ -816,9 +790,6 @@ DEPENDENCIES
   fog-aws (= 3.5.2)
   fuubar (= 2.5.0)
   gon (= 6.3.2)
-  guard (= 2.16.1)
-  guard-rspec (= 4.7.3)
-  guard-rubocop (= 1.3.0)
   haml_lint (= 0.35.0)
   hamlit (= 2.11.0)
   handlebars_assets (= 0.23.8)
@@ -886,8 +857,6 @@ DEPENDENCIES
   rails-controller-testing (= 1.0.4)
   rails-i18n (= 5.1.3)
   rails-timeago (= 2.18.0)
-  rb-fsevent (= 0.10.3)
-  rb-inotify (= 0.10.1)
   redcarpet (= 3.5.1)
   redis (= 4.2.5)
   responders (= 3.0.1)
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index f10147bba..000000000
--- a/Guardfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
-  watch(/^spec\/.+_spec\.rb$/)
-  watch(/^lib\/(.+)\.rb$/)       {|m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(/spec\/spec_helper.rb/)  { "spec" }
-
-  # Rails example
-  watch(/^spec\/.+_spec\.rb$/)
-  watch(/^app\/(.+)\.rb$/)                            {|m| "spec/#{m[1]}_spec.rb" }
-  watch(/^lib\/(.+)\.rb$/)                            {|m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$}) {|m|
-    ["spec/routing/#{m[1]}_routing_spec.rb",
-     "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb",
-     "spec/acceptance/#{m[1]}_spec.rb"]
-  }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch("spec/spec_helper.rb")                        { "spec" }
-  watch("config/routes.rb")                           { "spec/routing" }
-  watch("app/controllers/application_controller.rb")  { "spec/controllers" }
-
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          {|m| "spec/requests/#{m[1]}_spec.rb" }
-end
-
-guard :rubocop, all_on_start: false, keep_failed: false do
-  watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
-  watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
-end
diff --git a/bin/guard b/bin/guard
deleted file mode 100755
index 0c1a532bd..000000000
--- a/bin/guard
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'guard' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('guard', 'guard')

From f949ae2aab44b5e0d7f56d068413684b733fcc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:24:27 +0200
Subject: [PATCH 15/22] update pry

---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c3d942158..03d2ed061 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
     bootstrap-switch-rails (3.3.5)
     buftok (0.2.0)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     capybara (3.15.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -119,7 +119,7 @@ GEM
       websocket-driver (~> 0.6)
     chunky_png (1.3.11)
     citrus (3.0.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -377,7 +377,7 @@ GEM
     markerb (1.1.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
@@ -463,13 +463,13 @@ GEM
     pronto-scss (0.10.0)
       pronto (~> 0.10.0)
       scss_lint (~> 0.43, >= 0.43.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.3)
+      pry (~> 0.13.0)
+    public_suffix (4.0.6)
     raabro (1.4.0)
     racc (1.5.2)
     rack (2.2.3)

From 2412ee390dbec5522cd14d02d52ab240a903fdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 15:57:00 +0200
Subject: [PATCH 16/22] update capybara and cucumber-rails

---
 Gemfile                 |  6 +--
 Gemfile.lock            | 90 ++++++++++++++++++++++++++---------------
 features/support/env.rb |  2 +
 lib/tasks/cucumber.rake |  2 +-
 4 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/Gemfile b/Gemfile
index d00735331..01b4eea3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -274,8 +274,8 @@ group :test do
   # Cucumber (integration tests)
 
   gem "apparition",       "0.6.0"
-  gem "capybara",         "3.15.0"
-  gem "database_cleaner", "1.8.3"
+  gem "capybara",         "3.35.3"
+  gem "database_cleaner-active_record", "1.8.0"
 
   gem "cucumber-api-steps", "0.14", require: false
 
@@ -294,7 +294,7 @@ group :development, :test do
   gem "rspec-rails", "3.9.1"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "2.0.0", require: false
+  gem "cucumber-rails", "2.3.0", require: false
 
   # Jasmine (client side application tests (JS))
   gem "chrome_remote",             "0.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 03d2ed061..ef26a8946 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,6 @@ GEM
     attr_required (1.0.1)
     autoprefixer-rails (10.2.4.0)
       execjs
-    backports (3.17.0)
     bcrypt (3.1.16)
     bindata (2.4.6)
     bootstrap-sass (3.4.1)
@@ -82,13 +81,13 @@ GEM
     buftok (0.2.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.15.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     carrierwave (1.3.1)
       activemodel (>= 4.0.0)
@@ -142,32 +141,50 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
+    cucumber (5.3.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.1)
     cucumber-api-steps (0.14.0)
       cucumber (>= 2.0.2)
       jsonpath (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-rails (2.0.0)
-      capybara (>= 2.12, < 4)
-      cucumber (>= 3.0.2, < 4)
-      mime-types (>= 2.0, < 4)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.2.1)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-rails (2.3.0)
+      capybara (>= 2.18, < 4)
+      cucumber (>= 3.0.2, < 6)
+      mime-types (~> 3.2)
       nokogiri (~> 1.8)
-      railties (>= 4.2, < 7)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    database_cleaner (1.8.3)
+      railties (>= 5.0, < 7)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    database_cleaner (1.8.5)
+    database_cleaner-active_record (1.8.0)
+      activerecord
+      database_cleaner (~> 1.8.0)
     devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -198,7 +215,7 @@ GEM
       diaspora_federation (= 0.2.6)
       fabrication (~> 2.16)
       uuid (~> 2.3, >= 2.3.8)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -269,7 +286,6 @@ GEM
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.5)
       ffi (~> 1.0)
-    gherkin (5.1.0)
     gitlab (4.14.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
@@ -378,9 +394,10 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (1.0.0)
+    middleware (0.1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2021.0225)
     mini_magick (4.10.1)
     mini_mime (1.1.0)
     mini_portile2 (2.5.0)
@@ -388,7 +405,7 @@ GEM
     mobile-fu (1.4.0)
       rack-mobile-detect
       rails
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -463,6 +480,11 @@ GEM
     pronto-scss (0.10.0)
       pronto (~> 0.10.0)
       scss_lint (~> 0.43, >= 0.43.0)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -580,7 +602,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.1)
     redis (4.2.5)
-    regexp_parser (1.7.0)
+    regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
@@ -678,6 +700,8 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     sysexits (1.2.0)
     systemu (2.6.5)
     temple (0.8.2)
@@ -765,14 +789,14 @@ DEPENDENCIES
   autoprefixer-rails (= 10.2.4.0)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.5)
-  capybara (= 3.15.0)
+  capybara (= 3.35.3)
   carrierwave (= 1.3.1)
   chrome_remote (= 0.3.0)
   compass-rails (= 3.1.0)
   configurate (= 0.5.0)
   cucumber-api-steps (= 0.14)
-  cucumber-rails (= 2.0.0)
-  database_cleaner (= 1.8.3)
+  cucumber-rails (= 2.3.0)
+  database_cleaner-active_record (= 1.8.0)
   devise (= 4.7.3)
   devise-two-factor (= 4.0.0)
   devise_lastseenable (= 0.0.6)
diff --git a/features/support/env.rb b/features/support/env.rb
index 1d67651d3..d8cfcbd3a 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -7,6 +7,7 @@ ENV["RAILS_ENV"] ||= "test"
 # Have all rests run with english browser locale
 ENV["LANG"] = "C"
 
+require "database_cleaner/active_record"
 require "cucumber/rails"
 
 require "capybara/rails"
@@ -52,6 +53,7 @@ Capybara.default_max_wait_time = 30
 # of your scenarios, as this makes it hard to discover errors in your application.
 ActionController::Base.allow_rescue = false
 
+DatabaseCleaner.strategy = :truncation
 Cucumber::Rails::Database.autorun_database_cleaner = true
 Cucumber::Rails::World.use_transactional_tests = false
 
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 815d35f6a..068d3ddbf 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -20,7 +20,7 @@ begin
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
-      t.cucumber_opts = %w[--retry 3 --no-strict-flaky --fail-fast]
+      t.cucumber_opts = %w[--retry 3 --no-strict-flaky --fail-fast --publish-quiet]
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|

From a36ffff5f7da2ffca76779da93933a42a83e34aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:05:15 +0200
Subject: [PATCH 17/22] update linters

---
 .rubocop.yml |  3 +-
 Gemfile      | 16 ++++-----
 Gemfile.lock | 92 ++++++++++++++++++++++++++++------------------------
 3 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 5b6980af4..71c3b4bd0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,8 @@
 require: rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
+  NewCops: enable
   Exclude:
     - "bin/**/*"
     - "db/schema.rb"
diff --git a/Gemfile b/Gemfile
index 01b4eea3f..c7fae4ef0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -242,14 +242,14 @@ end
 
 group :development do
   # Linters
-  gem "haml_lint",      "0.35.0", require: false
-  gem "pronto",         "0.10.0", require: false
-  gem "pronto-eslint",  "0.10.0", require: false
-  gem "pronto-haml",    "0.10.0", require: false
-  gem "pronto-rubocop", "0.10.0", require: false
-  gem "pronto-scss",    "0.10.0", require: false
-  gem "rubocop",        "0.80.1", require: false
-  gem "rubocop-rails",  "2.4.1", require: false
+  gem "haml_lint",      "0.37.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-rubocop", "0.11.1", 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
 
   # Preloading environment
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ef26a8946..8bae08626 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
       fog-core
       mime-types (>= 2.99)
       unf
-    ast (2.4.0)
+    ast (2.4.2)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
@@ -286,8 +286,8 @@ GEM
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.5)
       ffi (~> 1.0)
-    gitlab (4.14.0)
-      httparty (~> 0.14, >= 0.14.0)
+    gitlab (4.17.0)
+      httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -299,8 +299,9 @@ GEM
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.35.0)
-      haml (>= 4.0, < 5.2)
+    haml_lint (0.37.0)
+      haml (>= 4.0, < 5.3)
+      parallel (~> 1.10)
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
@@ -326,7 +327,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -339,7 +340,6 @@ GEM
       i18n-inflector (~> 2.6)
       railties (>= 3.0.0)
     ipaddress (0.8.3)
-    jaro_winkler (1.5.4)
     jasmine (3.6.0)
       jasmine-core (~> 3.6.0)
       phantomjs
@@ -422,7 +422,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.18.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (1.9.1)
@@ -456,29 +456,31 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
-    parallel (1.19.1)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
     pg (1.2.3)
     phantomjs (2.1.1.0)
-    pronto (0.10.0)
-      gitlab (~> 4.0, >= 4.0.0)
+    pronto (0.11.0)
+      gitlab (~> 4.4, >= 4.4.0)
       httparty (>= 0.13.7)
       octokit (~> 4.7, >= 4.7.0)
       rainbow (>= 2.2, < 4.0)
-      rugged (~> 0.24, >= 0.23.0)
-      thor (~> 0.20.0)
-    pronto-eslint (0.10.0)
+      rexml (~> 3.2)
+      rugged (>= 0.23.0, < 1.1.0)
+      thor (>= 0.20.3, < 2.0)
+    pronto-eslint (0.11.0)
       eslintrb (~> 2.0, >= 2.0.0)
-      pronto (~> 0.10.0)
-    pronto-haml (0.10.0)
+      pronto (~> 0.11.0)
+    pronto-haml (0.11.0)
       haml_lint (~> 0.23)
-      pronto (~> 0.10.0)
-    pronto-rubocop (0.10.0)
-      pronto (~> 0.10.0)
-      rubocop (~> 0.50, >= 0.49.1)
-    pronto-scss (0.10.0)
-      pronto (~> 0.10.0)
+      pronto (~> 0.11.0)
+      rubocop (< 1.0)
+    pronto-rubocop (0.11.1)
+      pronto (~> 0.11.0)
+      rubocop (>= 0.63.1, < 2.0)
+    pronto-scss (0.11.0)
+      pronto (~> 0.11.0)
       scss_lint (~> 0.43, >= 0.43.0)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
@@ -608,7 +610,7 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rotp (6.2.0)
     rqrcode (1.1.2)
       chunky_png (~> 1.0)
@@ -636,21 +638,25 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
       rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.4.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
+      rubocop (>= 0.90.0, < 2.0)
     ruby-oembed (0.12.0)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     rubyzip (2.3.0)
-    rugged (0.99.0)
+    rugged (1.0.1)
     safe_yaml (1.0.5)
     sass (3.4.25)
     sass-rails (5.0.7)
@@ -707,7 +713,7 @@ GEM
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
     timecop (0.9.1)
@@ -738,7 +744,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     unicorn (5.5.3)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -814,7 +820,7 @@ DEPENDENCIES
   fog-aws (= 3.5.2)
   fuubar (= 2.5.0)
   gon (= 6.3.2)
-  haml_lint (= 0.35.0)
+  haml_lint (= 0.37.0)
   hamlit (= 2.11.0)
   handlebars_assets (= 0.23.8)
   http_accept_language (= 2.1.1)
@@ -843,11 +849,11 @@ DEPENDENCIES
   open_graph_reader (= 0.7.1)
   openid_connect (= 1.1.8)
   pg (= 1.2.3)
-  pronto (= 0.10.0)
-  pronto-eslint (= 0.10.0)
-  pronto-haml (= 0.10.0)
-  pronto-rubocop (= 0.10.0)
-  pronto-scss (= 0.10.0)
+  pronto (= 0.11.0)
+  pronto-eslint (= 0.11.0)
+  pronto-haml (= 0.11.0)
+  pronto-rubocop (= 0.11.1)
+  pronto-scss (= 0.11.0)
   pry
   pry-byebug
   rack-cors (= 1.1.1)
@@ -887,8 +893,8 @@ DEPENDENCIES
   rqrcode (= 1.1.2)
   rspec-json_expectations (~> 2.1)
   rspec-rails (= 3.9.1)
-  rubocop (= 0.80.1)
-  rubocop-rails (= 2.4.1)
+  rubocop (= 0.93.1)
+  rubocop-rails (= 2.9.1)
   ruby-oembed (= 0.12.0)
   rubyzip (= 2.3.0)
   sass-rails (= 5.0.7)

From e4164eb18fcbeffe586ea65aa492f54c8c61b1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:45:10 +0200
Subject: [PATCH 18/22] update rspec suite dependencies

---
 Gemfile      | 12 ++++-----
 Gemfile.lock | 76 ++++++++++++++++++++++++++--------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/Gemfile b/Gemfile
index c7fae4ef0..0c2e9bcc9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -258,7 +258,7 @@ group :development do
   gem "pry-byebug"
 
   # test coverage
-  gem "simplecov", "0.16.1", require: false
+  gem "simplecov", "0.21.2", require: false
 
   gem "turbo_dev_assets", "0.0.2"
 end
@@ -267,7 +267,7 @@ group :test do
   # RSpec (unit tests, some integration tests)
 
   gem "fixture_builder",   "0.5.2"
-  gem "fuubar",            "2.5.0"
+  gem "fuubar",            "2.5.1"
   gem "json-schema-rspec", "0.0.4"
   gem "rspec-json_expectations", "~> 2.1"
 
@@ -282,16 +282,16 @@ group :test do
   # General helpers
 
   gem "factory_girl_rails", "4.9.0"
-  gem "shoulda-matchers",   "4.0.1"
-  gem "timecop",            "0.9.1"
-  gem "webmock",            "3.8.3", require: false
+  gem "shoulda-matchers",   "4.5.1"
+  gem "timecop",            "0.9.4"
+  gem "webmock",            "3.12.2", require: false
 
   gem "diaspora_federation-test", "0.2.6"
 end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.9.1"
+  gem "rspec-rails", "5.0.1"
 
   # Cucumber (integration tests)
   gem "cucumber-rails", "2.3.0", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 8bae08626..f3183692c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -138,8 +138,8 @@ GEM
     concurrent-ruby (1.1.8)
     configurate (0.5.0)
     connection_pool (2.2.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     cucumber (5.3.0)
       builder (~> 3.2, >= 3.2.4)
@@ -216,7 +216,7 @@ GEM
       fabrication (~> 2.16)
       uuid (~> 2.3, >= 2.3.8)
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     encryptor (3.0.0)
@@ -240,7 +240,7 @@ GEM
       kostya-sigar (~> 2.0.0)
       state_machines
       thor
-    fabrication (2.21.0)
+    fabrication (2.22.0)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.9.0)
@@ -281,7 +281,7 @@ GEM
     fugit (1.4.4)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    fuubar (2.5.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.5)
@@ -616,28 +616,28 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
     rqrcode_core (0.1.2)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-json_expectations (2.2.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.1)
+      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.10.2)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -657,7 +657,6 @@ GEM
     ruby-progressbar (1.11.0)
     rubyzip (2.3.0)
     rugged (1.0.1)
-    safe_yaml (1.0.5)
     sass (3.4.25)
     sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
@@ -674,7 +673,7 @@ GEM
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
     secure_headers (6.3.2)
-    shoulda-matchers (4.0.1)
+    shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
     sidekiq (6.2.1)
       connection_pool (>= 2.2.2)
@@ -686,11 +685,12 @@ GEM
     simple_captcha2 (0.5.0)
       rails (>= 4.1)
     simple_oauth (0.3.1)
-    simplecov (0.16.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sinon-rails (1.15.0)
       railties (>= 3.1)
     sprockets (3.7.2)
@@ -716,7 +716,7 @@ GEM
     thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timecop (0.9.1)
+    timecop (0.9.4)
     timers (4.3.0)
     to_regexp (0.2.1)
     toml-rb (2.0.1)
@@ -769,7 +769,7 @@ GEM
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.8.3)
+    webmock (3.12.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -818,7 +818,7 @@ DEPENDENCIES
   faraday_middleware (= 0.13.1)
   fixture_builder (= 0.5.2)
   fog-aws (= 3.5.2)
-  fuubar (= 2.5.0)
+  fuubar (= 2.5.1)
   gon (= 6.3.2)
   haml_lint (= 0.37.0)
   hamlit (= 2.11.0)
@@ -892,22 +892,22 @@ DEPENDENCIES
   responders (= 3.0.1)
   rqrcode (= 1.1.2)
   rspec-json_expectations (~> 2.1)
-  rspec-rails (= 3.9.1)
+  rspec-rails (= 5.0.1)
   rubocop (= 0.93.1)
   rubocop-rails (= 2.9.1)
   ruby-oembed (= 0.12.0)
   rubyzip (= 2.3.0)
   sass-rails (= 5.0.7)
   secure_headers (= 6.3.2)
-  shoulda-matchers (= 4.0.1)
+  shoulda-matchers (= 4.5.1)
   sidekiq (= 6.2.1)
   sidekiq-cron (= 1.2.0)
   simple_captcha2 (= 0.5.0)
-  simplecov (= 0.16.1)
+  simplecov (= 0.21.2)
   sinon-rails (= 1.15.0)
   sprockets-rails (= 3.2.1)
   string-direction (= 1.2.2)
-  timecop (= 0.9.1)
+  timecop (= 0.9.4)
   toml-rb (= 2.0.1)
   turbo_dev_assets (= 0.0.2)
   twitter (= 7.0.0)
@@ -918,7 +918,7 @@ DEPENDENCIES
   unicorn-worker-killer (= 0.4.4)
   uuid (= 2.3.9)
   versionist (= 2.0.1)
-  webmock (= 3.8.3)
+  webmock (= 3.12.2)
   will_paginate (= 3.3.0)
 
 BUNDLED WITH

From a18defc90f042829107f1dc278d96ea221c162ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:46:28 +0200
Subject: [PATCH 19/22] update haml to 5.2.1

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f3183692c..c219181e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    haml (5.1.2)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
     haml_lint (0.37.0)

From 1d8b9bde439b3a2e552c9eb385ae30b481edd5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:48:08 +0200
Subject: [PATCH 20/22] update hamlit to 2.14.6

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

diff --git a/Gemfile b/Gemfile
index 0c2e9bcc9..f770e2519 100644
--- a/Gemfile
+++ b/Gemfile
@@ -191,7 +191,7 @@ gem "typhoeus",           "1.4.0"
 # Views
 
 gem "gon",                     "6.3.2"
-gem "hamlit",                  "2.11.0"
+gem "hamlit",                  "2.14.6"
 gem "mobile-fu",               "1.4.0"
 gem "rails-timeago",           "2.18.0"
 gem "will_paginate",           "3.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index c219181e0..1a383ff84 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -305,7 +305,7 @@ GEM
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hamlit (2.11.0)
+    hamlit (2.14.6)
       temple (>= 0.8.2)
       thor
       tilt
@@ -821,7 +821,7 @@ DEPENDENCIES
   fuubar (= 2.5.1)
   gon (= 6.3.2)
   haml_lint (= 0.37.0)
-  hamlit (= 2.11.0)
+  hamlit (= 2.14.6)
   handlebars_assets (= 0.23.8)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)

From 24e8be37c2a357359afbf06d868e0481affbc1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:52:46 +0200
Subject: [PATCH 21/22] update jasmine to 3.7.0

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

diff --git a/Gemfile b/Gemfile
index f770e2519..6115b060d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -251,8 +251,6 @@ group :development do
   gem "rubocop",        "0.93.1", require: false
   gem "rubocop-rails",  "2.9.1", require: false
 
-  # Preloading environment
-
   # Debugging
   gem "pry"
   gem "pry-byebug"
@@ -298,7 +296,7 @@ group :development, :test do
 
   # Jasmine (client side application tests (JS))
   gem "chrome_remote",             "0.3.0"
-  gem "jasmine",                   "3.6.0"
+  gem "jasmine",                   "3.7.0"
   gem "jasmine-jquery-rails",      "2.0.3"
   gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
   gem "sinon-rails",               "1.15.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a383ff84..609f734e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,12 +340,12 @@ GEM
       i18n-inflector (~> 2.6)
       railties (>= 3.0.0)
     ipaddress (0.8.3)
-    jasmine (3.6.0)
-      jasmine-core (~> 3.6.0)
+    jasmine (3.7.0)
+      jasmine-core (~> 3.7.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (3.6.0)
+    jasmine-core (3.7.1)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
@@ -825,7 +825,7 @@ DEPENDENCIES
   handlebars_assets (= 0.23.8)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)
-  jasmine (= 3.6.0)
+  jasmine (= 3.7.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.3.5)
   js-routes (= 1.4.9)

From 231ca2c3b1449e80d29f9703eef2a2daa69b48f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 11 Apr 2021 16:59:36 +0200
Subject: [PATCH 22/22] update unrestricted gems

---
 Gemfile.lock | 58 +++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 609f734e7..5f956dce5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       rack (>= 1.1.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aes_key_wrap (1.0.1)
+    aes_key_wrap (1.1.0)
     apparition (0.6.0)
       capybara (~> 3.13, < 4)
       websocket-driver (>= 0.6.5)
@@ -73,7 +73,7 @@ GEM
     autoprefixer-rails (10.2.4.0)
       execjs
     bcrypt (3.1.16)
-    bindata (2.4.6)
+    bindata (2.4.8)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
@@ -116,7 +116,7 @@ GEM
       timers (>= 4.1.1)
     chrome_remote (0.3.0)
       websocket-driver (~> 0.6)
-    chunky_png (1.3.11)
+    chunky_png (1.4.0)
     citrus (3.0.2)
     coderay (1.1.3)
     compass (1.0.3)
@@ -232,7 +232,7 @@ GEM
       tzinfo
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    excon (0.73.0)
+    excon (0.79.0)
     execjs (2.7.0)
     eye (0.10.0)
       celluloid (~> 0.17.3)
@@ -266,7 +266,7 @@ GEM
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (2.2.0)
+    fog-core (2.2.3)
       builder
       excon (~> 0.71)
       formatador (~> 0.2)
@@ -284,7 +284,7 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    get_process_mem (0.2.5)
+    get_process_mem (0.2.7)
       ffi (~> 1.0)
     gitlab (4.17.0)
       httparty (~> 0.18)
@@ -315,7 +315,7 @@ GEM
       tilt (>= 1.2)
     hashdiff (1.0.1)
     hashie (4.1.0)
-    http (4.3.0)
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
@@ -358,7 +358,7 @@ GEM
       rails (>= 4.0, < 6.0)
       sprockets (>= 3.0.0)
     json (2.3.0)
-    json-jwt (1.11.0)
+    json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
@@ -367,18 +367,17 @@ GEM
     json-schema-rspec (0.0.4)
       json-schema (~> 2.5)
       rspec
-    jsonpath (1.0.5)
+    jsonpath (1.1.0)
       multi_json
-      to_regexp (~> 0.2.1)
-    jwt (2.2.1)
+    jwt (2.2.2)
     kgio (2.11.3)
     kostya-sigar (2.0.8)
     leaflet-rails (1.6.0)
       rails (>= 4.2.0)
     little-plugger (1.1.4)
-    logging (2.2.2)
+    logging (2.3.0)
       little-plugger (~> 1.1)
-      multi_json (~> 1.10)
+      multi_json (~> 1.14)
     logging-rails (0.6.0)
       logging (>= 1.8)
     loofah (2.9.1)
@@ -415,8 +414,8 @@ GEM
     nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    oauth (0.5.4)
-    oauth2 (1.4.4)
+    oauth (0.5.6)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -428,12 +427,12 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-oauth (1.1.0)
+    omniauth-oauth (1.2.0)
       oauth
-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
+      omniauth (>= 1.0, < 3)
+    omniauth-oauth2 (1.7.1)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
     omniauth-tumblr (1.2)
       multi_json
       omniauth-oauth (~> 1.0)
@@ -504,12 +503,12 @@ GEM
       activesupport
     rack-mobile-detect (0.4.0)
       rack
-    rack-oauth2 (1.10.1)
+    rack-oauth2 (1.16.0)
       activesupport
       attr_required
       httpclient
       json-jwt (>= 1.11.0)
-      rack
+      rack (>= 2.1.0)
     rack-piwik (0.3.0)
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
@@ -599,7 +598,7 @@ GEM
     rainbow (3.0.0)
     raindrops (0.19.1)
     rake (12.3.3)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
@@ -615,7 +614,7 @@ GEM
     rqrcode (1.1.2)
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
-    rqrcode_core (0.1.2)
+    rqrcode_core (0.2.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -702,7 +701,7 @@ GEM
       sprockets (>= 3.0.0)
     state_machines (0.5.0)
     string-direction (1.2.2)
-    swd (1.1.2)
+    swd (1.2.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
@@ -717,8 +716,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.10)
     timecop (0.9.4)
-    timers (4.3.0)
-    to_regexp (0.2.1)
+    timers (4.3.3)
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     turbo_dev_assets (0.0.2)
@@ -743,7 +741,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     unicorn (5.5.3)
       kgio (~> 2.6)
@@ -757,7 +755,7 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.8)
+    validate_url (1.0.13)
       activemodel (>= 3.0.0)
       public_suffix
     versionist (2.0.1)
@@ -779,7 +777,7 @@ GEM
     will_paginate (3.3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
+    yard (0.9.26)
 
 PLATFORMS
   ruby