From 33f8c1c5eb075424eaba1263846efb09adfa89f5 Mon Sep 17 00:00:00 2001
From: Ricardo Trindade <ricardo.trindade743@gmail.com>
Date: Mon, 30 Oct 2023 15:04:12 +0100
Subject: [PATCH] Remove version check from update cache_concern.rb (#27592)
---
app/controllers/concerns/cache_concern.rb | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index 55ebe1bd64..2dfe5e263a 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -92,18 +92,10 @@ module CacheConcern
arguments
end
- if Rails.gem_version >= Gem::Version.new('7.0')
- def attributes_for_database(record)
- attributes = record.attributes_for_database
- attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
- attributes
- end
- else
- def attributes_for_database(record)
- attributes = record.instance_variable_get(:@attributes).send(:attributes).transform_values(&:value_for_database)
- attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
- attributes
- end
+ def attributes_for_database(record)
+ attributes = record.attributes_for_database
+ attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
+ attributes
end
def deserialize_record(class_name, attributes_from_database, new_record = false) # rubocop:disable Style/OptionalBooleanParameter
--
GitLab