diff --git a/Gemfile b/Gemfile
index ccce52ebd..82e429584 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,8 +28,8 @@ gem "json-schema", "2.8.1"
 
 gem "devise", "4.8.0"
 gem "devise_lastseenable", "0.0.6"
-gem "devise-two-factor", "4.0.0"
-gem "rqrcode", "2.0.0"
+gem "devise-two-factor", "4.0.1"
+gem "rqrcode", "2.1.0"
 
 # Captcha
 
@@ -37,8 +37,8 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
-gem "redis", "4.3.1"
-gem "sidekiq", "6.2.1"
+gem "redis", "4.5.1"
+gem "sidekiq", "6.2.2"
 
 # Scheduled processing
 
@@ -46,12 +46,12 @@ gem "sidekiq-cron", "1.2.0"
 
 # Compression
 
-gem "terser", "1.1.5"
+gem "terser", "1.1.7"
 
 # Configuration
 
 gem "configurate", "0.5.0"
-gem "toml-rb", "2.0.1"
+gem "toml-rb", "2.1.0"
 
 # Cross-origin resource sharing
 
@@ -59,7 +59,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
 
 # CSS
 
-gem "autoprefixer-rails",     "10.2.5.1"
+gem "autoprefixer-rails",     "10.3.3.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"
@@ -80,7 +80,7 @@ gem "activerecord-import", "1.1.0"
 # File uploading
 
 gem "carrierwave", "2.2.2"
-gem "fog-aws",     "3.10.0"
+gem "fog-aws",     "3.12.0"
 gem "mini_magick", "4.11.0"
 
 # GUID generation
@@ -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",         "1.4.14"
+gem "js-routes",         "2.1.2"
 gem "js_image_paths",    "0.1.1"
 
 source "https://gems.diasporafoundation.org" do
@@ -143,7 +143,7 @@ gem "leaflet-rails",       "1.7.0"
 
 # Parsing
 
-gem "nokogiri",          "1.11.7"
+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"
@@ -155,18 +155,19 @@ gem "string-direction", "1.2.2"
 
 # Security Headers
 
-gem "secure_headers", "6.3.2"
+gem "secure_headers", "6.3.3"
 
 # Services
 
-gem "omniauth",           "1.9.1"
-gem "omniauth-tumblr",    "1.2"
-gem "omniauth-twitter",   "1.4.0"
-gem "omniauth-wordpress", "0.2.2"
-gem "twitter",            "7.0.0"
+gem "omniauth",                       "2.0.4"
+gem "omniauth-rails_csrf_protection", "1.0.0"
+gem "omniauth-tumblr",                "1.2"
+gem "omniauth-twitter",               "1.4.0"
+gem "omniauth-wordpress",             "0.2.2"
+gem "twitter",                        "7.0.0"
 
 # OpenID Connect
-gem "openid_connect", "1.2.0"
+gem "openid_connect", "1.3.0"
 
 # Serializers
 
@@ -182,19 +183,19 @@ gem "acts-as-taggable-on", "8.1.0"
 
 # URIs and HTTP
 
-gem "addressable",        "2.7.0", require: "addressable/uri"
+gem "addressable",        "2.8.0", require: "addressable/uri"
 gem "faraday",            "0.17.4"
-gem "faraday_middleware", "0.13.1"
-gem "faraday-cookie_jar", "0.0.6"
+gem "faraday-cookie_jar", "0.0.7"
+gem "faraday_middleware", "0.14.0"
 gem "typhoeus",           "1.4.0"
 
 # Views
 
 gem "gon",                     "6.4.0"
-gem "hamlit",                  "2.15.0"
+gem "hamlit",                  "2.15.1"
 gem "mobile-fu",               "1.4.0"
 gem "rails-timeago",           "2.19.1"
-gem "will_paginate",           "3.3.0"
+gem "will_paginate",           "3.3.1"
 
 # Logging
 
@@ -202,7 +203,7 @@ gem "logging-rails", "0.6.0", require: "logging/rails"
 
 # Reading and writing zip files
 
-gem "rubyzip", "2.3.0", require: "zip"
+gem "rubyzip", "2.3.2", require: "zip"
 
 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs:
@@ -237,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.14.2", require: false
+  gem "asset_sync", "2.15.0", require: false
 end
 
 group :development do
@@ -275,7 +276,7 @@ group :test do
 
   gem "apparition",       "0.6.0"
   gem "capybara",         "3.35.3"
-  gem "database_cleaner-active_record", "1.8.0"
+  gem "database_cleaner-active_record", "2.0.1"
 
   gem "cucumber-api-steps", "0.14", require: false
 
@@ -284,21 +285,21 @@ group :test do
   gem "factory_girl_rails", "4.9.0"
   gem "shoulda-matchers",   "4.5.1"
   gem "timecop",            "0.9.4"
-  gem "webmock",            "3.13.0", require: false
+  gem "webmock",            "3.14.0", require: false
 
   gem "diaspora_federation-test", "0.2.7"
 end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "5.0.1"
+  gem "rspec-rails", "5.0.2"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "2.3.0", require: false
+  gem "cucumber-rails", "2.4.0", require: false
 
   # Jasmine (client side application tests (JS))
   gem "chrome_remote",             "0.3.0"
-  gem "jasmine",                   "3.7.0"
+  gem "jasmine",                   "3.10.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 7957ddd36..9d7f9771a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,14 +54,14 @@ GEM
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     apparition (0.6.0)
       capybara (~> 3.13, < 4)
       websocket-driver (>= 0.6.5)
     arel (9.0.0)
-    asset_sync (2.14.2)
+    asset_sync (2.15.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
@@ -70,8 +70,8 @@ GEM
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
-    autoprefixer-rails (10.2.5.1)
-      execjs (> 0)
+    autoprefixer-rails (10.3.3.0)
+      execjs (~> 2)
     bcrypt (3.1.16)
     bindata (2.4.10)
     bootstrap-sass (3.4.1)
@@ -145,57 +145,59 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    cucumber (5.3.0)
+    cucumber (7.1.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)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
       diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
+      sys-uname (~> 1.2, >= 1.2.2)
     cucumber-api-steps (0.14.0)
       cucumber (>= 2.0.2)
       jsonpath (>= 0.1.2)
-    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)
+    cucumber-core (10.1.0)
+      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-messages (~> 17.1, >= 17.1.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-rails (2.4.0)
       capybara (>= 2.18, < 4)
-      cucumber (>= 3.0.2, < 6)
-      mime-types (~> 3.2)
-      nokogiri (~> 1.8)
+      cucumber (>= 3.2, < 8)
+      mime-types (~> 3.3)
+      nokogiri (~> 1.10)
       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)
+      rexml (~> 3.0)
+      webrick (~> 1.7)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.0)
+      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)
+    database_cleaner-core (2.0.1)
     devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (4.0.0)
+    devise-two-factor (4.0.1)
       activesupport (< 6.2)
       attr_encrypted (>= 1.3, < 4, != 2)
       devise (~> 4.0)
@@ -232,11 +234,11 @@ GEM
       execjs
       multi_json (>= 1.3)
       rake
-    et-orbi (1.2.4)
+    et-orbi (1.2.6)
       tzinfo
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.82.0)
+    excon (0.88.0)
     execjs (2.8.1)
     eye (0.10.0)
       celluloid (~> 0.17.3)
@@ -252,10 +254,10 @@ GEM
       railties (>= 3.0.0)
     faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
+    faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.15.4)
     ffi-compiler (1.0.1)
@@ -265,7 +267,7 @@ GEM
       activerecord (>= 2)
       activesupport (>= 2)
       hashdiff
-    fog-aws (3.10.0)
+    fog-aws (3.12.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -278,11 +280,11 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.3.0)
-    fugit (1.5.0)
+    fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     fuubar (2.5.1)
@@ -293,14 +295,14 @@ GEM
     gitlab (4.17.0)
       httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
     gon (6.4.0)
       actionpack (>= 3.0.20)
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    haml (5.2.1)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml_lint (0.37.1)
@@ -309,7 +311,7 @@ GEM
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hamlit (2.15.0)
+    hamlit (2.15.1)
       temple (>= 0.8.2)
       thor
       tilt
@@ -331,11 +333,11 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -347,18 +349,19 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     ipaddress (0.8.3)
-    jasmine (3.7.0)
-      jasmine-core (~> 3.7.0)
+    jasmine (3.10.0)
+      jasmine-core (~> 3.10.0)
       phantomjs
-      rack (>= 1.2.1)
+      rack (>= 2.1.4)
       rake
-    jasmine-core (3.7.1)
+      webrick
+    jasmine-core (3.10.1)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    js-routes (1.4.14)
+    js-routes (2.1.2)
       railties (>= 4)
     js_image_paths (0.1.1)
       rails (>= 4.0, < 6.0)
@@ -375,9 +378,9 @@ GEM
       rspec
     jsonpath (1.1.0)
       multi_json
-    jwt (2.2.3)
+    jwt (2.3.0)
     kgio (2.11.4)
-    kostya-sigar (2.0.8)
+    kostya-sigar (2.0.10)
     leaflet-rails (1.7.0)
       rails (>= 4.2.0)
     listen (3.5.1)
@@ -396,19 +399,18 @@ GEM
       systemu (~> 2.6.5)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     markdown-it-html5-embed (1.0.0)
     markerb (1.1.0)
     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.2021.0225)
+    mime-types-data (3.2021.0901)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     mobile-fu (1.4.0)
       rack-mobile-detect
@@ -419,11 +421,11 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     naught (1.1.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    oauth (0.5.6)
+    oauth (0.5.7)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -433,15 +435,19 @@ GEM
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (1.9.1)
+    omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
+      rack-protection
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
+    omniauth-rails_csrf_protection (1.0.0)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
     omniauth-tumblr (1.2)
       multi_json
       omniauth-oauth (~> 1.0)
@@ -453,7 +459,7 @@ GEM
     open_graph_reader (0.7.2)
       faraday (>= 0.9.0)
       nokogiri (~> 1.6)
-    openid_connect (1.2.0)
+    openid_connect (1.3.0)
       activemodel
       attr_required (>= 1.0.0)
       json-jwt (>= 1.5.0)
@@ -464,8 +470,8 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     phantomjs (2.1.1.0)
@@ -490,11 +496,6 @@ GEM
     pronto-scss (0.11.0)
       pronto (~> 0.11.0)
       scss_lint (~> 0.43, >= 0.43.0)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -512,13 +513,15 @@ GEM
       activesupport
     rack-mobile-detect (0.4.0)
       rack
-    rack-oauth2 (1.17.0)
+    rack-oauth2 (1.19.0)
       activesupport
       attr_required
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
     rack-piwik (0.3.0)
+    rack-protection (2.1.0)
+      rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
@@ -608,11 +611,11 @@ GEM
     rainbow (3.0.0)
     raindrops (0.19.2)
     rake (12.3.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    redis (4.3.1)
+    redis (4.5.1)
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -621,10 +624,10 @@ GEM
       railties (>= 5.0)
     rexml (3.2.5)
     rotp (6.2.0)
-    rqrcode (2.0.0)
+    rqrcode (2.1.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
-    rqrcode_core (1.0.0)
+    rqrcode_core (1.2.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -638,7 +641,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.1)
+    rspec-rails (5.0.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -646,7 +649,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -664,9 +667,9 @@ GEM
       rubocop (>= 0.90.0, < 2.0)
     ruby-oembed (0.15.0)
     ruby-progressbar (1.11.0)
-    ruby-vips (2.1.2)
+    ruby-vips (2.1.3)
       ffi (~> 1.12)
-    rubyzip (2.3.0)
+    rubyzip (2.3.2)
     rugged (1.0.1)
     sass (3.4.25)
     sass-rails (5.0.7)
@@ -683,10 +686,10 @@ GEM
     scss_lint (0.55.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
-    secure_headers (6.3.2)
+    secure_headers (6.3.3)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.2.1)
+    sidekiq (6.2.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -714,7 +717,7 @@ GEM
     ssrf_filter (1.0.7)
     state_machines (0.5.0)
     string-direction (1.2.2)
-    swd (1.2.0)
+    swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
@@ -725,14 +728,14 @@ GEM
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    terser (1.1.5)
+    terser (1.1.7)
       execjs (>= 0.3.0, < 3)
     thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
     timecop (0.9.4)
     timers (4.3.3)
-    toml-rb (2.0.1)
+    toml-rb (2.1.0)
       citrus (~> 3.0, > 3.0)
     turbo_dev_assets (0.0.2)
     twitter (7.0.0)
@@ -754,8 +757,8 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8)
+    unicode-display_width (1.8.0)
     unicorn (6.0.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -777,17 +780,18 @@ GEM
       yard (~> 0.9.20)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webfinger (1.1.0)
+    webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
+    will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.26)
@@ -800,10 +804,10 @@ DEPENDENCIES
   activerecord-import (= 1.1.0)
   acts-as-taggable-on (= 8.1.0)
   acts_as_api (= 1.0.1)
-  addressable (= 2.7.0)
+  addressable (= 2.8.0)
   apparition (= 0.6.0)
-  asset_sync (= 2.14.2)
-  autoprefixer-rails (= 10.2.5.1)
+  asset_sync (= 2.15.0)
+  autoprefixer-rails (= 10.3.3.0)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)
   capybara (= 3.35.3)
@@ -812,10 +816,10 @@ DEPENDENCIES
   compass-rails (= 3.1.0)
   configurate (= 0.5.0)
   cucumber-api-steps (= 0.14)
-  cucumber-rails (= 2.3.0)
-  database_cleaner-active_record (= 1.8.0)
+  cucumber-rails (= 2.4.0)
+  database_cleaner-active_record (= 2.0.1)
   devise (= 4.8.0)
-  devise-two-factor (= 4.0.0)
+  devise-two-factor (= 4.0.1)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
   diaspora_federation-json_schema (= 0.2.7)
@@ -825,21 +829,21 @@ DEPENDENCIES
   eye (= 0.10.0)
   factory_girl_rails (= 4.9.0)
   faraday (= 0.17.4)
-  faraday-cookie_jar (= 0.0.6)
-  faraday_middleware (= 0.13.1)
+  faraday-cookie_jar (= 0.0.7)
+  faraday_middleware (= 0.14.0)
   fixture_builder (= 0.5.2)
-  fog-aws (= 3.10.0)
+  fog-aws (= 3.12.0)
   fuubar (= 2.5.1)
   gon (= 6.4.0)
   haml_lint (= 0.37.1)
-  hamlit (= 2.15.0)
+  hamlit (= 2.15.1)
   handlebars_assets (= 0.23.9)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)
-  jasmine (= 3.7.0)
+  jasmine (= 3.10.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.4.0)
-  js-routes (= 1.4.14)
+  js-routes (= 2.1.2)
   js_image_paths (= 0.1.1)
   json (= 2.3.0)
   json-schema (= 2.8.1)
@@ -853,13 +857,14 @@ DEPENDENCIES
   minitest
   mobile-fu (= 1.4.0)
   mysql2 (= 0.5.3)
-  nokogiri (= 1.11.7)
-  omniauth (= 1.9.1)
+  nokogiri (= 1.12.5)
+  omniauth (= 2.0.4)
+  omniauth-rails_csrf_protection (= 1.0.0)
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)
   omniauth-wordpress (= 0.2.2)
   open_graph_reader (= 0.7.2)
-  openid_connect (= 1.2.0)
+  openid_connect (= 1.3.0)
   pg (= 1.2.3)
   pronto (= 0.11.0)
   pronto-eslint (= 0.11.0)
@@ -901,28 +906,28 @@ DEPENDENCIES
   rails-i18n (= 5.1.3)
   rails-timeago (= 2.19.1)
   redcarpet (= 3.5.1)
-  redis (= 4.3.1)
+  redis (= 4.5.1)
   responders (= 3.0.1)
-  rqrcode (= 2.0.0)
+  rqrcode (= 2.1.0)
   rspec-json_expectations (~> 2.1)
-  rspec-rails (= 5.0.1)
+  rspec-rails (= 5.0.2)
   rubocop (= 0.93.1)
   rubocop-rails (= 2.9.1)
   ruby-oembed (= 0.15.0)
-  rubyzip (= 2.3.0)
+  rubyzip (= 2.3.2)
   sass-rails (= 5.0.7)
-  secure_headers (= 6.3.2)
+  secure_headers (= 6.3.3)
   shoulda-matchers (= 4.5.1)
-  sidekiq (= 6.2.1)
+  sidekiq (= 6.2.2)
   sidekiq-cron (= 1.2.0)
   simple_captcha2 (= 0.5.0)
   simplecov (= 0.21.2)
   sinon-rails (= 1.15.0)
   sprockets-rails (= 3.2.2)
   string-direction (= 1.2.2)
-  terser (= 1.1.5)
+  terser (= 1.1.7)
   timecop (= 0.9.4)
-  toml-rb (= 2.0.1)
+  toml-rb (= 2.1.0)
   turbo_dev_assets (= 0.0.2)
   twitter (= 7.0.0)
   twitter-text (= 1.14.7)
@@ -931,8 +936,8 @@ DEPENDENCIES
   unicorn-worker-killer (= 0.4.5)
   uuid (= 2.3.9)
   versionist (= 2.0.1)
-  webmock (= 3.13.0)
-  will_paginate (= 3.3.0)
+  webmock (= 3.14.0)
+  will_paginate (= 3.3.1)
 
 BUNDLED WITH
    1.17.3
diff --git a/app/views/services/_add_remove_services.haml b/app/views/services/_add_remove_services.haml
index bac69588f..b10a4f6c7 100644
--- a/app/views/services/_add_remove_services.haml
+++ b/app/views/services/_add_remove_services.haml
@@ -17,7 +17,7 @@
 
       - else
         = t("services.index.not_logged_in")
-        = link_to(t("services.index.connect"), "/auth/#{provider}")
+        = link_to(t("services.index.connect"), "/auth/#{provider}", method: :post)
 
 - else
   .well
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index ee99d3d9b..991575157 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -124,7 +124,7 @@
                     - if service_unconnected?(service)
                       = link_to(content_tag(:div, nil,
                         class: "social-media-logos-#{service.to_s.downcase}-24x24",
-                        title: service.to_s.titleize), "/auth/#{service}")
+                        title: service.to_s.titleize), "/auth/#{service}", method: :post)
 
           .section.collapsed
             .title
diff --git a/config/initializers/jsroutes.rb b/config/initializers/jsroutes.rb
index e82bf7125..8e6f5176f 100644
--- a/config/initializers/jsroutes.rb
+++ b/config/initializers/jsroutes.rb
@@ -3,4 +3,6 @@
 JsRoutes.setup do |config|
   config.camel_case = true
   config.compact = true
+  config.module_type = nil
+  config.namespace = "Routes"
 end