From ec439b4bf75be088eb100f745936de2519d7aeda Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 3 Jan 2024 10:28:17 +0100 Subject: [PATCH 1/5] update paper-trail to 15.1 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 72e893263e..10f0da7d93 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem 'bootsnap', require: false gem 'geocoder' gem 'gmaps4rails' gem 'mimemagic', '> 0.3.5' -gem 'paper_trail', '~> 12.1' +gem 'paper_trail', '~> 15.1' gem 'rack-rewrite' gem 'rack-timeout' gem 'roadie-rails' diff --git a/Gemfile.lock b/Gemfile.lock index f1a2875692..fa21bd6ef3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -464,9 +464,9 @@ GEM orm_adapter (0.5.0) pagy (5.10.1) activesupport - paper_trail (12.3.0) - activerecord (>= 5.2) - request_store (~> 1.1) + paper_trail (15.1.0) + activerecord (>= 6.1) + request_store (~> 1.4) parallel (1.24.0) paranoia (2.6.3) activerecord (>= 5.1, < 7.2) @@ -878,7 +878,7 @@ DEPENDENCIES openid_connect (~> 1.3) order_management! pagy (~> 5.1) - paper_trail (~> 12.1) + paper_trail (~> 15.1) paranoia (~> 2.4) paypal-sdk-merchant (= 1.117.2) pdf-reader From 0a474f9288577734dbeac09edd99fbc03df2254f Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 3 Jan 2024 11:12:06 +0100 Subject: [PATCH 2/5] add "ActiveSupport::TimeWithZone" to yaml_column_permitted_classes --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 116fb5970a..9584a34a90 100644 --- a/config/application.rb +++ b/config/application.rb @@ -227,7 +227,7 @@ module Openfoodnetwork config.action_view.form_with_generates_remote_forms = false config.active_record.cache_versioning = false config.active_record.has_many_inversing = false - config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol] + config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, ActiveSupport::TimeWithZone] config.active_support.escape_html_entities_in_json = true From d591ce69778773c0c021897d9ed764ff969c92fb Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 3 Jan 2024 11:24:50 +0100 Subject: [PATCH 3/5] add Time to yaml_column_permitted_classes --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 9584a34a90..478c9cfe6f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -227,7 +227,7 @@ module Openfoodnetwork config.action_view.form_with_generates_remote_forms = false config.active_record.cache_versioning = false config.active_record.has_many_inversing = false - config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, ActiveSupport::TimeWithZone] + config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, ActiveSupport::TimeWithZone, Time] config.active_support.escape_html_entities_in_json = true From ab1a0ba986137be5f0c68773ed00131e9dd41ef7 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 3 Jan 2024 11:41:37 +0100 Subject: [PATCH 4/5] add ActiveSupport::TimeZone to yaml_column_permitted_classes --- config/application.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/application.rb b/config/application.rb index 478c9cfe6f..1146d04c77 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,8 +9,8 @@ require "rails" "action_mailer/railtie", "active_job/railtie", "action_cable/engine", - #"action_mailbox/engine", - #"action_text/engine", + # "action_mailbox/engine", + # "action_text/engine", "rails/test_unit/railtie", "sprockets/railtie" # Disable this after migrating to Webpacker ].each do |railtie| @@ -150,6 +150,7 @@ module Openfoodnetwork module ::Reporting; end Rails.application.reloader.to_prepare do next if defined?(::Reporting) && defined?(::Reporting::Errors) + loader = Zeitwerk::Loader.new loader.push_dir("#{Rails.root}/lib/reporting", namespace: ::Reporting) loader.enable_reloading @@ -227,7 +228,9 @@ module Openfoodnetwork config.action_view.form_with_generates_remote_forms = false config.active_record.cache_versioning = false config.active_record.has_many_inversing = false - config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, ActiveSupport::TimeWithZone, Time] + config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, Time, + ActiveSupport::TimeWithZone, + ActiveSupport::TimeZone] config.active_support.escape_html_entities_in_json = true From 074e97c414e581b5cbc05c3a0c2148f3882e4266 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 4 Jan 2024 16:01:35 +1100 Subject: [PATCH 5/5] Remove paper_trail version restriction for Dependabot updates --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 10f0da7d93..c321c79738 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem 'bootsnap', require: false gem 'geocoder' gem 'gmaps4rails' gem 'mimemagic', '> 0.3.5' -gem 'paper_trail', '~> 15.1' +gem 'paper_trail' gem 'rack-rewrite' gem 'rack-timeout' gem 'roadie-rails' diff --git a/Gemfile.lock b/Gemfile.lock index fa21bd6ef3..7e2a8cceab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -878,7 +878,7 @@ DEPENDENCIES openid_connect (~> 1.3) order_management! pagy (~> 5.1) - paper_trail (~> 15.1) + paper_trail paranoia (~> 2.4) paypal-sdk-merchant (= 1.117.2) pdf-reader