Merge branch 'master' into #3311-upgrade-solr-to-7

CHANGELOG.md

@@ -9,6 +9,9 @@ New entries in this file should aim to provide a meaningful amount of informatio
 
 ## [Unreleased]
 
+### Changed
+* #3420: Update bundler to match version in production [PR#3433](https://github.com/ualbertalib/jupiter/pull/3433)
+
 ### Chores
 * Bump rubocop from 1.62.1 to 1.63.1 [PR#3439](https://github.com/ualbertalib/jupiter/pull/3439)
 

Gemfile

@@ -54,9 +54,9 @@ gem 'datacite-client', github: 'ualbertalib/datacite-client', tag: 'v0.1.0', req
 gem 'differ' # Used to diff two strings
 gem 'draper'
 gem 'edtf', '~> 3.1' # parsing Extended Date/Time Format
-gem 'flipper', '~> 1.2.2' # Feature flags for Ruby
-gem 'flipper-active_record', '~> 1.2.2' # Store feature flags in ActiveRecord
-gem 'flipper-ui', '~> 1.2.2' # UI for feature flags
+gem 'flipper', '~> 1.3.0' # Feature flags for Ruby
+gem 'flipper-active_record', '~> 1.3.0' # Store feature flags in ActiveRecord
+gem 'flipper-ui', '~> 1.3.0' # UI for feature flags
 gem 'jbuilder' # generate JSON objects
 gem 'kaminari' # Pagination
 gem 'paper_trail', '~> 15.1.0' # Track object changes
@@ -94,7 +94,7 @@ group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem 'debug', platforms: [:mri, :mingw, :x64_mingw]
 
-  gem 'rubocop', '~> 1.63.1', require: false
+  gem 'rubocop', '~> 1.63.2', require: false
   gem 'rubocop-minitest', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false

Gemfile.lock

@@ -233,16 +233,17 @@ GEM
     faraday-net_http (3.1.0)
       net-http
     ffi (1.16.3)
-    flipper (1.2.2)
+    flipper (1.3.0)
       concurrent-ruby (< 2)
-    flipper-active_record (1.2.2)
+    flipper-active_record (1.3.0)
       activerecord (>= 4.2, < 8)
-      flipper (~> 1.2.2)
-    flipper-ui (1.2.2)
+      flipper (~> 1.3.0)
+    flipper-ui (1.3.0)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.2.2)
+      flipper (~> 1.3.0)
       rack (>= 1.4, < 4)
-      rack-protection (>= 1.5.3, <= 4.0.0)
+      rack-protection (>= 1.5.3, < 5.0.0)
+      rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 7)
     fugit (1.9.0)
       et-orbi (~> 1, >= 1.2.7)
@@ -336,7 +337,7 @@ GEM
     matrix (0.4.2)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     minitest-retry (0.2.2)
       minitest (>= 5.0)
@@ -482,7 +483,7 @@ GEM
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rubocop (1.63.1)
+    rubocop (1.63.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -647,9 +648,9 @@ DEPENDENCIES
   edtf (~> 3.1)
   erb_lint (>= 0.0.35)
   faker
-  flipper (~> 1.2.2)
-  flipper-active_record (~> 1.2.2)
-  flipper-ui (~> 1.2.2)
+  flipper (~> 1.3.0)
+  flipper-active_record (~> 1.3.0)
+  flipper-ui (~> 1.3.0)
   google-api-client
   haikunator
   image_processing
@@ -678,7 +679,7 @@ DEPENDENCIES
   redis (~> 4.8)
   rollbar
   rsolr
-  rubocop (~> 1.63.1)
+  rubocop (~> 1.63.2)
   rubocop-minitest
   rubocop-performance
   rubocop-rails
@@ -703,4 +704,4 @@ RUBY VERSION
    ruby 3.1.4p223
 
 BUNDLED WITH
-   2.5.5
+   2.5.6