diff --git a/Gemfile b/Gemfile
index 4e2daaa8b2..c9faa02104 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ def gh(slug)
   "https://github.com/#{slug}"
 end
 
-gem 'activesupport', '~> 4.0'
+gem 'activesupport', '~> 6.1'
 gem 'addressable', '~> 2.3'
 gem 'codeclimate-test-reporter', require: false, group: %i[development test]
 gem 'coder'
diff --git a/Gemfile.lock b/Gemfile.lock
index 500686a149..1af1811baa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,11 +37,12 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    activesupport (6.1.7.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
@@ -52,7 +53,7 @@ GEM
       simplecov (<= 0.13)
     coder (0.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.2)
     crack (0.4.5)
       rexml
@@ -81,7 +82,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (0.9.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     json (2.3.1)
@@ -102,7 +103,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     minitar (0.6.1)
-    minitest (5.14.0)
+    minitest (5.17.0)
     mocha (1.7.0)
       metaclass (~> 0.0.1)
     msgpack (1.2.4)
@@ -203,7 +204,6 @@ GEM
       rack-protection (= 2.0.8.1)
       sinatra (= 2.0.8.1)
       tilt (~> 2.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     travis (1.8.9)
       backports
@@ -218,8 +218,8 @@ GEM
       hashr (~> 2.0)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
@@ -229,12 +229,13 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.8)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 4.0)
+  activesupport (~> 6.1)
   addressable (~> 2.3)
   codeclimate-test-reporter
   coder