Merge branch 'master' into dependabot/bundler/will_paginate-4.0.1

department-of-veterans-affairs · Jan 13, 2025 · df495be · df495be
2 parents e0d4974 + a1a1c20
commit df495be
Show file tree

Hide file tree

Showing 33 changed files with 486 additions and 206 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,6 @@ version: 2
 updates:
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/" # Location of package manifests
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 15
     schedule:
       interval: "daily"
diff --git a/Dockerfile b/Dockerfile
@@ -40,7 +40,7 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--", "./docker-entrypoint.sh"]
 ###
 FROM development AS builder
 
-ENV BUNDLER_VERSION='2.5.9'
+ENV BUNDLER_VERSION='2.6.0'
 
 ARG bundler_opts
 COPY --chown=gi-bill-data-service:gi-bill-data-service . .

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '7.1.3.4'
+gem 'rails', '7.1.5.1'
 
 gem 'active_model_serializers', '~> 0.10.14' # JSON API
 gem 'activerecord-import' # Mass importing of CSV data
@@ -34,7 +34,7 @@ gem 'rack', '>= 2.2.8.1'
 gem 'rack-cors', require: 'rack/cors' # CORS
 gem 'rails-html-sanitizer', '>= 1.4.4'
 gem 'rainbow'
-gem 'rexml', '~> 3.3.6'
+gem 'rexml', '~> 3.3.9'
 gem 'roo', '~> 2.10'
 gem 'roo-xls', '~> 1.2'
 gem 'ruby-saml'