Merge branch 'chore/upgrade-rails' into staging

wri · Feb 28, 2024 · 4bff7c9 · 4bff7c9
2 parents 617d79e + 71b2db7
commit 4bff7c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -149,6 +149,7 @@ end
 # Server
 gem "dotenv-rails"
 gem "puma"
-gem "rack-cors"
+# TODO: remove version lock after this issue is resolved: https://github.com/cyu/rack-cors/issues/274
+gem "rack-cors", "2.0.0"
 gem "redis-rails"
 gem "tzinfo-data"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -428,7 +428,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.7.3)
     rack (2.2.8.1)
-    rack-cors (2.0.1)
+    rack-cors (2.0.0)
       rack (>= 2.0.0)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
@@ -735,7 +735,7 @@ DEPENDENCIES
   paranoia
   pg
   puma
-  rack-cors
+  rack-cors (= 2.0.0)
   rack-mini-profiler (~> 2.0)
   rails (~> 7.1.3)
   rails-erd