From 0ce451b86a35629cc11ce9db0fb18c9da7acf69a Mon Sep 17 00:00:00 2001
From: Rob Paskin <rjpaskin+git@gmail.com>
Date: Fri, 17 Oct 2025 17:06:56 +0100
Subject: [PATCH 1/2] Loosen Rails gem version requirements

One less thing to have to fix with Rails upgrades, and gem has not
needed changes for the past few upgrades anyway.
---
 report_generator.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/report_generator.gemspec b/report_generator.gemspec
index 5257444..94ef0da 100644
--- a/report_generator.gemspec
+++ b/report_generator.gemspec
@@ -35,13 +35,13 @@ Gem::Specification.new do |spec|
 
   current_ruby_version = Gem::Version.new(RUBY_VERSION)
 
-  spec.add_dependency 'activerecord', '>= 4.2', '< 7.1'
-  spec.add_dependency 'activesupport', '>= 4.2', '< 7.1'
+  spec.add_dependency 'activerecord', '>= 4.2'
+  spec.add_dependency 'activesupport', '>= 4.2'
   spec.add_dependency 'csv-safe', '>= 3.2.1' if Gem::Requirement.new('>= 2.6').satisfied_by?(current_ruby_version)
   spec.add_dependency 'dragonfly', '~> 1'
   spec.add_dependency 'jwt', '~> 1.5'
   spec.add_dependency 'rails-html-sanitizer', '~> 1'
-  spec.add_dependency 'railties', '>= 4.2', '< 7.1'
+  spec.add_dependency 'railties', '>= 4.2'
   spec.add_dependency 'sidekiq', '>= 3'
 
   spec.add_development_dependency 'bundler', '>= 2.2.18', '< 3'

From c0acf2f49a8565e8c8e081a2ff04db029eb927d5 Mon Sep 17 00:00:00 2001
From: Rob Paskin <rjpaskin+git@gmail.com>
Date: Fri, 17 Oct 2025 17:07:46 +0100
Subject: [PATCH 2/2] Pin Rails gem and Bundler version used for dev/test

---
 Gemfile              | 5 +++++
 docker-entrypoint.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 88c1871..a6e1017 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in report_generator.gemspec
 gemspec
+
+# Used for testing
+gem 'activerecord', '~> 7.0.0'
+gem 'activesupport', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index a430d43..2748055 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -20,7 +20,7 @@ endgroup
 
 group "bundle install"
 
-bundle install \
+bundle _2.4.22_ install \
   --jobs "$(getconf _NPROCESSORS_ONLN)" \
   --retry 2