OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Update rails to version 7.1.4 (#31563)

pull/30606/head
Matt Jankowski 2024-09-06 11:22:35 -04:00 committed by GitHub
parent c88ba523ee
commit b530fc5267
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Gemfile.lock
View File

@ -10,35 +10,35 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.1.3.4) actioncable (7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (7.1.3.4) actionmailbox (7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
activejob (= 7.1.3.4) activejob (= 7.1.4)
activerecord (= 7.1.3.4) activerecord (= 7.1.4)
activestorage (= 7.1.3.4) activestorage (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
mail (>= 2.7.1) mail (>= 2.7.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
actionmailer (7.1.3.4) actionmailer (7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
actionview (= 7.1.3.4) actionview (= 7.1.4)
activejob (= 7.1.3.4) activejob (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (7.1.3.4) actionpack (7.1.4)
actionview (= 7.1.3.4) actionview (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
racc racc
rack (>= 2.2.4) rack (>= 2.2.4)
@ -46,15 +46,15 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.4) actiontext (7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
activerecord (= 7.1.3.4) activerecord (= 7.1.4)
activestorage (= 7.1.3.4) activestorage (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.1.3.4) actionview (7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
@ -64,22 +64,22 @@ GEM
activemodel (>= 4.1) activemodel (>= 4.1)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (7.1.3.4) activejob (7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.1.3.4) activemodel (7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
activerecord (7.1.3.4) activerecord (7.1.4)
activemodel (= 7.1.3.4) activemodel (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (7.1.3.4) activestorage (7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
activejob (= 7.1.3.4) activejob (= 7.1.4)
activerecord (= 7.1.3.4) activerecord (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (7.1.3.4) activesupport (7.1.4)
base64 base64
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
@ -638,20 +638,20 @@ GEM
rackup (1.0.0) rackup (1.0.0)
rack (< 3) rack (< 3)
webrick webrick
rails (7.1.3.4) rails (7.1.4)
actioncable (= 7.1.3.4) actioncable (= 7.1.4)
actionmailbox (= 7.1.3.4) actionmailbox (= 7.1.4)
actionmailer (= 7.1.3.4) actionmailer (= 7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
actiontext (= 7.1.3.4) actiontext (= 7.1.4)
actionview (= 7.1.3.4) actionview (= 7.1.4)
activejob (= 7.1.3.4) activejob (= 7.1.4)
activemodel (= 7.1.3.4) activemodel (= 7.1.4)
activerecord (= 7.1.3.4) activerecord (= 7.1.4)
activestorage (= 7.1.3.4) activestorage (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.1.3.4) railties (= 7.1.4)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1)
@ -666,9 +666,9 @@ GEM
rails-i18n (7.0.9) rails-i18n (7.0.9)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8) railties (>= 6.0.0, < 8)
railties (7.1.3.4) railties (7.1.4)
actionpack (= 7.1.3.4) actionpack (= 7.1.4)
activesupport (= 7.1.3.4) activesupport (= 7.1.4)
irb irb
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)

4
config/initializers/active_record_encryption.rb
View File

@ -38,8 +38,4 @@ Rails.application.configure do
config.active_record.encryption.key_derivation_salt = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT') config.active_record.encryption.key_derivation_salt = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT')
config.active_record.encryption.primary_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY') config.active_record.encryption.primary_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY')
config.active_record.encryption.support_sha1_for_non_deterministic_encryption = true config.active_record.encryption.support_sha1_for_non_deterministic_encryption = true
# TODO: https://github.com/rails/rails/issues/50604#issuecomment-1880990392
# Remove after updating to Rails 7.1.4
ActiveRecord::Encryption.configure(**config.active_record.encryption)
end end