gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3270 from openSUSE/depfu/update/paper_trail-15.1.0

Browse source 
Update paper_trail 12.3.0 → 15.1.0 (major)
This commit is contained in:
Henne Vogelsang 2024-03-26 16:48:50 +01:00 • committed by GitHub
commit 52ee2e0ee4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Gemfile.lock
View file

@ -225,7 +225,7 @@ GEM
http-accept (1.7.0) http-accept (1.7.0)
http-cookie (1.0.5) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (1.14.1) i18n (1.14.4)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.17.1) i18n_data (0.17.1)
simple_po_parser (~> 1.1) simple_po_parser (~> 1.1)
@ -289,7 +289,7 @@ GEM
mini_magick (4.12.0) mini_magick (4.12.0)
mini_mime (1.1.5) mini_mime (1.1.5)
mini_portile2 (2.8.5) mini_portile2 (2.8.5)
minitest (5.22.2) minitest (5.22.3)
momentjs-rails (2.29.4.1) momentjs-rails (2.29.4.1)
railties (>= 3.1) railties (>= 3.1)
monetize (1.13.0) monetize (1.13.0)
@ -353,9 +353,9 @@ GEM
actionpack (>= 4.2) actionpack (>= 4.2)
omniauth (~> 2.0) omniauth (~> 2.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paper_trail (12.3.0) paper_trail (15.1.0)
activerecord (>= 5.2) activerecord (>= 6.1)
request_store (~> 1.1) request_store (~> 1.4)
parallel (1.24.0) parallel (1.24.0)
parser (3.3.0.5) parser (3.3.0.5)
ast (~> 2.4.1) ast (~> 2.4.1)

2
config/application.rb
View file

@ -36,6 +36,6 @@ module Osem
# This is a nightmare with our current data model, no one ever thought about this. # This is a nightmare with our current data model, no one ever thought about this.
config.active_record.belongs_to_required_by_default = false config.active_record.belongs_to_required_by_default = false
# https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017 # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
config.active_record.yaml_column_permitted_classes = ['Date', 'DateTime', 'Symbol', 'Time'] config.active_record.yaml_column_permitted_classes = ['Date', 'DateTime', 'Symbol', 'Time', 'ActiveSupport::TimeWithZone', 'ActiveSupport::TimeZone']
end end
end end