Merge branch 'main' into update-rescue-from

Gemfile

@@ -185,7 +185,7 @@ gem 'oj_mimic_json'
 gem 'rack-cors'
 
 # Data visualization and query
-gem 'blazer'
+gem 'blazer', '< 3.0'
 
 group :development, :production do
   # Get env variables from .env file

Gemfile.lock

@@ -196,12 +196,11 @@ GEM
     bigdecimal (3.1.8)
     bindata (2.5.0)
     bindex (0.8.1)
-    blazer (3.0.4)
-      activerecord (>= 6.1)
-      chartkick (>= 5)
-      csv
-      railties (>= 6.1)
-      safely_block (>= 0.4)
+    blazer (2.6.5)
+      activerecord (>= 5)
+      chartkick (>= 3.2)
+      railties (>= 5)
+      safely_block (>= 0.1.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     bootstrap-sass (3.4.1)
@@ -264,7 +263,6 @@ GEM
     crass (1.0.6)
     css_parser (1.19.0)
       addressable
-    csv (3.3.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
@@ -304,7 +302,7 @@ GEM
     exception_notification (4.5.0)
       actionmailer (>= 5.2, < 8)
       activesupport (>= 5.2, < 8)
-    execjs (2.9.1)
+    execjs (2.10.0)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -834,7 +832,7 @@ DEPENDENCIES
   aws-sdk-rails
   aws-sdk-rds
   bcrypt
-  blazer
+  blazer (< 3.0)
   bootsnap
   bootstrap-sass
   byebug