Upgrade to rails 6.0

1 files changed, 63 insertions, 47 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3a6990d88..fe1f5cc44 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,52 +2,66 @@ GEM
   remote: https://rubygems.org/
   remote: https://gems.diasporafoundation.org/
   specs:
-    actioncable (5.2.8)
-      actionpack (= 5.2.8)
+    actioncable (6.0.5.1)
+      actionpack (= 6.0.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8)
-      actionpack (= 5.2.8)
-      actionview (= 5.2.8)
-      activejob (= 5.2.8)
+    actionmailbox (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activejob (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      activestorage (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      actionview (= 6.0.5.1)
+      activejob (= 6.0.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.8)
-      actionview (= 5.2.8)
-      activesupport (= 5.2.8)
+    actionpack (6.0.5.1)
+      actionview (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       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.8)
-      activesupport (= 5.2.8)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      activestorage (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.5.1)
+      activesupport (= 6.0.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.9.8)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
-    activejob (5.2.8)
-      activesupport (= 5.2.8)
+    activejob (6.0.5.1)
+      activesupport (= 6.0.5.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.8)
-      activesupport (= 5.2.8)
-    activerecord (5.2.8)
-      activemodel (= 5.2.8)
-      activesupport (= 5.2.8)
-      arel (>= 9.0)
+    activemodel (6.0.5.1)
+      activesupport (= 6.0.5.1)
+    activerecord (6.0.5.1)
+      activemodel (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (5.2.8)
-      actionpack (= 5.2.8)
-      activerecord (= 5.2.8)
-      marcel (~> 1.0.0)
-    activesupport (5.2.8)
+    activestorage (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activejob (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      marcel (~> 1.0)
+    activesupport (6.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     acts-as-taggable-on (8.1.0)
       activerecord (>= 5.0, < 6.2)
     acts_as_api (1.0.1)
@@ -60,7 +74,6 @@ GEM
     apparition (0.6.0)
       capybara (~> 3.13, < 4)
       websocket-driver (>= 0.6.5)
-    arel (9.0.0)
     asset_sync (2.15.2)
       activemodel (>= 4.1.0)
       fog-core
@@ -317,7 +330,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -502,18 +515,20 @@ GEM
       rack
     rack-test (2.0.2)
       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)
+    rails (6.0.5.1)
+      actioncable (= 6.0.5.1)
+      actionmailbox (= 6.0.5.1)
+      actionmailer (= 6.0.5.1)
+      actionpack (= 6.0.5.1)
+      actiontext (= 6.0.5.1)
+      actionview (= 6.0.5.1)
+      activejob (= 6.0.5.1)
+      activemodel (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      activestorage (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.8)
+      railties (= 6.0.5.1)
       sprockets-rails (>= 2.0.0)
     rails-assets-autosize (4.0.2)
     rails-assets-backbone (1.3.3)
@@ -571,18 +586,18 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    rails-i18n (5.1.3)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
+      railties (>= 6.0.0, < 7)
     rails-timeago (2.20.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
-    railties (5.2.8)
-      actionpack (= 5.2.8)
-      activesupport (= 5.2.8)
+    railties (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.1.1)
     raindrops (0.20.0)
     rake (12.3.3)
@@ -770,6 +785,7 @@ GEM
       nokogiri (~> 1.8)
     yard (0.9.28)
       webrick (~> 1.7.0)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -849,7 +865,7 @@ DEPENDENCIES
   rack-piwik (= 0.3.0)
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
-  rails (= 5.2.8)
+  rails (= 6.0.5.1)
   rails-assets-autosize (= 4.0.2)!
   rails-assets-backbone (= 1.3.3)!
   rails-assets-blueimp-gallery (= 2.33.0)!
@@ -875,7 +891,7 @@ DEPENDENCIES
   rails-assets-markdown-it-sup (= 1.0.0)!
   rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
   rails-controller-testing (= 1.0.5)
-  rails-i18n (= 5.1.3)
+  rails-i18n (= 6.0.0)
   rails-timeago (= 2.20.0)
   redcarpet (= 3.5.1)
   redis (= 4.7.0)