diff --git a/Gemfile b/Gemfile
index 290358c85..a1d7b86f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'actionview'
-gem 'activerecord', '~> 5.2'
+gem 'activerecord', '~> 6.1'
 gem 'addressable'
 gem 'ast'
 gem 'base62-rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6464b5d24..51a725773 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,33 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.1)
+      actionview (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.7.1)
+      activesupport (= 6.1.7.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.1.7.1)
+      activesupport (= 6.1.7.1)
+    activerecord (6.1.7.1)
+      activemodel (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
+    activesupport (6.1.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    arel (9.0.0)
     ast (2.4.0)
     base62-rb (0.3.1)
     bcp47 (0.3.3)
@@ -42,15 +41,15 @@ GEM
       rake (< 13.0)
     coderay (1.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
     daemons (1.3.1)
-    database_cleaner (1.8.5)
-    database_cleaner-active_record (1.8.0)
-      activerecord
-      database_cleaner (~> 1.8.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     date_time_precision (0.8.1)
     docile (1.3.2)
     domain_name (0.5.20190701)
@@ -110,7 +109,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.3.1)
@@ -163,12 +162,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (6.1.7.1)
+      actionpack (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.0.0)
     rake (12.3.3)
     rb-readline (0.5.5)
@@ -213,21 +212,20 @@ GEM
       sinatra (= 2.1.0)
       tilt (~> 2.0)
     sqlite3 (1.4.2)
-    standalone_migrations (6.0.0)
-      activerecord (>= 4.2.7, < 6.1.0, != 5.2.3.rc1, != 5.2.3)
-      railties (>= 4.2.7, < 6.1.0, != 5.2.3.rc1, != 5.2.3)
+    standalone_migrations (6.1.0)
+      activerecord (>= 4.2.7, < 6.2.0, != 5.2.3.rc1, != 5.2.3)
+      railties (>= 4.2.7, < 6.2.0, != 5.2.3.rc1, != 5.2.3)
       rake (>= 10.0)
     thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
-    time_difference (0.7.0)
-      activesupport (~> 5.1)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    time_difference (0.5.0)
+      activesupport
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
@@ -236,13 +234,14 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   actionview
-  activerecord (~> 5.2)
+  activerecord (~> 6.1)
   addressable
   ast
   base62-rb