Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.5

Gemfile

@@ -5,7 +5,7 @@ ruby '>= 2.4.0', '< 2.7.0'
 
 gem 'pkg-config', '~> 1.3'
 
-gem 'puma', '~> 4.3'
+gem 'puma', '~> 5.0'
 gem 'rails', '~> 5.2.3'
 gem 'thor', '~> 0.20'
 

Gemfile.lock

@@ -421,7 +421,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.1.0)
-    puma (4.3.5)
+    puma (5.0)
       nio4r (~> 2.0)
     pundit (2.0.1)
       activesupport (>= 3.0.0)
@@ -729,7 +729,7 @@ DEPENDENCIES
   private_address_check (~> 0.5)
   pry-byebug (~> 3.7)
   pry-rails (~> 0.3)
-  puma (~> 4.3)
+  puma (~> 5.0)
   pundit (~> 2.0)
   rack-attack (~> 6.0)
   rack-cors (~> 1.0)