Merge branch 'master' into webpacker-migration

ualbertalib · Feb 16, 2024 · e4dc7f2 · e4dc7f2
2 parents c6e0ec8 + 96450ff
commit e4dc7f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ New entries in this file should aim to provide a meaningful amount of informatio
 
 ### Added
 - Migrate Webpacker to Esbuild [PR#3320](https://github.com/ualbertalib/jupiter/pull/3320)
+- 
+### Chores
+- Update Bundler to v2.5.5 to match production [PR#3374](https://github.com/ualbertalib/jupiter/pull/3374)
 
 ## [2.7.1] - 2024-01-24
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -447,7 +447,7 @@ GEM
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    redis-client (0.19.1)
+    redis-client (0.20.0)
       connection_pool
     regexp_parser (2.9.0)
     reline (0.4.2)
@@ -525,7 +525,7 @@ GEM
       fugit (~> 1.8)
       globalid (>= 1.0.1)
       sidekiq (>= 6)
-    sidekiq-unique-jobs (8.0.7)
+    sidekiq-unique-jobs (8.0.9)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 7.0.0, < 8.0.0)
       thor (>= 1.0, < 3.0)
@@ -686,4 +686,4 @@ RUBY VERSION
    ruby 3.1.4p223
 
 BUNDLED WITH
-   2.4.18
+   2.5.5