Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Stop overwriting `Rails.application.config.active_record.yaml_column_… (#12124)

Damian Legawiec9b0d993697fa
diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
index d9ff47b639..4e961bc4ac 100644
--- a/core/lib/spree/core/engine.rb
+++ b/core/lib/spree/core/engine.rb
@@ -26,7 +26,7 @@ module Spree
initializer 'spree.environment', before: :load_config_initializers do |app|
app.config.spree = Environment.new(SpreeCalculators.new, Spree::Core::Configuration.new, Spree::Core::RuntimeConfiguration.new, Spree::Core::Dependencies.new)
- app.config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal]
+ app.config.active_record.yaml_column_permitted_classes << [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess]
Spree::Config = app.config.spree.preferences
Spree::RuntimeConfig = app.config.spree.runtime_preferences
Spree::Dependencies = app.config.spree.dependencies
diff --git a/sample/lib/spree_sample.rb b/sample/lib/spree_sample.rb
index 69c691ece0..65fe968ddf 100644
--- a/sample/lib/spree_sample.rb
+++ b/sample/lib/spree_sample.rb
@@ -5,7 +5,6 @@ module SpreeSample
class Engine < Rails::Engine
engine_name 'spree_sample'
- config.active_record.yaml_column_permitted_classes = [Symbol]
# Needs to be here so we can access it inside the tests
def self.load_samples
Spree::Webhooks.disable_webhooks do