Merge branch 'chore/upgrade-rails' into staging

wri · Feb 23, 2024 · 37113df · 37113df
2 parents 73e13c4 + 9922280
commit 37113df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -11,6 +11,9 @@ end
 
 gem "bootsnap", require: false
 
+# TODO: after upgrading passenger change it's config to use passenger_preload_bundler on
+gem "base64", "0.1.1"
+
 # Active admin
 gem "active_admin_paranoia", git: "https://github.com/tsubik/active_admin_paranoia.git"
 gem "active_admin_sidebar", git: "https://github.com/activeadmin-plugins/active_admin_sidebar.git"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -167,7 +167,7 @@ GEM
       ruby2_keywords (>= 0.0.2)
     ast (2.4.2)
     attr_extras (7.1.0)
-    base64 (0.2.0)
+    base64 (0.1.1)
     bcrypt (3.1.20)
     bigdecimal (3.1.6)
     bindex (0.8.1)
@@ -692,6 +692,7 @@ DEPENDENCIES
   activerecord-postgis-adapter
   acts_as_list
   annotate
+  base64 (= 0.1.1)
   bcrypt
   bootsnap
   brakeman