From c1e0276212b8d1eb4e23cc7452193e460831c2af Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 1 Nov 2023 16:04:42 +0100
Subject: [PATCH 1/2] Revert "Do not require active_storage/engine"

This reverts commit ea0254b13abe237cb56cd79787207bb7691d3173.

(cherry picked from commit 9c87e0803b5a695fea6ea381eddd9a916cbe5a3a)
---
 core/lib/spree/core.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 3f7b4680bcd..54d4f60987f 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -6,6 +6,7 @@
 require "active_job/railtie"
 require "active_model/railtie"
 require "active_record/railtie"
+require "active_storage/engine"
 require "sprockets/railtie"
 
 require 'active_support/deprecation'

From 6400427201189fb54b05e6692ca6103611f02182 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 1 Nov 2023 16:05:11 +0100
Subject: [PATCH 2/2] Add activestorage as dependency

We use ActiveStorage::Current in our BaseControllers
since a3119d560c7575e41fbaa05cc090738e6b9e83e4 but
we never depended on it.

For stores never having activestorage as dependency
this was breaking.

(cherry picked from commit d495087acc49590779687afd7049887f5778db66)
---
 core/solidus_core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
index 7d7ed15de41..58011abdaf6 100644
--- a/core/solidus_core.gemspec
+++ b/core/solidus_core.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
-    activesupport railties
+    activestorage activesupport railties
   ].each do |rails_dep|
     s.add_dependency rails_dep, ['>= 7.0', '< 7.1']
   end