merge most recent security updates properly

Author: kbluescode

Gemfile

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# A sample Gemfile
 source 'https://rubygems.org'
 
-gem 'activesupport', '~> 6.0'
+gem 'activerecord', '~> 6.0', '>= 6.0.3.5'
+gem 'activesupport', '~> 6.0', '>= 6.0.1'
 gem 'json', '~> 2.3'
 gem 'puma', '~> 4.3.5'
 gem 'rack', '~> 2.1'

Gemfile.lock

@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    backports (3.15.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     bond (0.5.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    i18n (1.8.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
+    json (2.5.1)
     method_source (0.9.2)
-    minitest (5.14.1)
-    multi_json (1.14.1)
-    mustermann (1.0.3)
-    nio4r (2.5.2)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.6)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    puma (4.3.5)
+    puma (4.3.7)
       nio4r (~> 2.0)
-    rack (2.1.4)
-    rack-protection (2.0.7)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (13.0.1)
+    rake (13.0.3)
     ripl (0.7.1)
       bond (~> 0.5.1)
     ripl-multi_line (0.3.1)
@@ -43,40 +43,40 @@ GEM
       rack (>= 1.0)
       rack-test (~> 0.6.2)
       ripl (>= 0.7.0)
+    ruby2_keywords (0.0.4)
     shotgun (0.9.2)
       rack (>= 1.0)
-    sinatra (2.0.7)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.7)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-activerecord (2.0.14)
-      activerecord (>= 3.2)
+    sinatra-activerecord (2.0.22)
+      activerecord (>= 4.1)
       sinatra (>= 1.0)
-    sinatra-contrib (2.0.7)
-      backports (>= 2.8.2)
+    sinatra-contrib (2.1.0)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.7)
-      sinatra (= 2.0.7)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
       tilt (~> 2.0)
-    sqlite3 (1.4.1)
-    thread_safe (0.3.6)
+    sqlite3 (1.4.2)
     tilt (2.0.10)
     tux (0.3.0)
       ripl (>= 0.3.5)
       ripl-multi_line (>= 0.2.4)
       ripl-rack (>= 0.2.0)
       sinatra (>= 1.2.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 6.0)
+  activerecord (~> 6.0, >= 6.0.3.5)
+  activesupport (~> 6.0, >= 6.0.1)
   json (~> 2.3)
   pry (~> 0.12.2)
   puma (~> 4.3.5)