From 969dcae8d0bd8ff783dcdfa31c24ae0e3eb6ac7e Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 7 Jan 2026 14:08:10 +1100
Subject: [PATCH 1/3] Remove unnecessary require statement

---
 db/default/users.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/db/default/users.rb b/db/default/users.rb
index 85fdd0379c..a56ac58bad 100644
--- a/db/default/users.rb
+++ b/db/default/users.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'highline/import'
-
 # see last line where we create an admin if there is none, asking for email and password
 def prompt_for_admin_password
   if ENV['ADMIN_PASSWORD']

From 61c7c2682217738039db08e385e1c9f55706382a Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 7 Jan 2026 14:09:42 +1100
Subject: [PATCH 2/3] Remove version restriction on highline

It came from a very old version of the Spree code.
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index e57cc9b443..dbb60d9700 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,7 +49,7 @@ gem 'acts_as_list', '1.0.4'
 gem 'cancancan', '~> 1.15.0'
 gem 'digest'
 gem 'ffaker'
-gem 'highline', '2.0.3' # Necessary for the install generator
+gem 'highline'
 gem 'json'
 gem 'monetize', '~> 1.11'
 gem 'paranoia', '~> 2.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 23d22a0797..d2171987e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1017,7 +1017,7 @@ DEPENDENCIES
   good_migrations
   haml
   haml_lint
-  highline (= 2.0.3)
+  highline
   i18n
   i18n-js (~> 3.9.0)
   i18n-tasks

From 79a9dbcf68510a60aa33d8d4a36fb106b96e2516 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 7 Jan 2026 14:12:59 +1100
Subject: [PATCH 3/3] Bump highline from 2.0.3 to 3.1.2 to support newer rubies

---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d2171987e6..b6264c90b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -388,7 +388,8 @@ GEM
     hashdiff (1.2.1)
     hashery (2.1.2)
     hashie (5.0.0)
-    highline (2.0.3)
+    highline (3.1.2)
+      reline
     htmlentities (4.4.2)
     http_parser.rb (0.8.0)
     i18n (1.14.7)