mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-07 19:05:08 +01:00
Code Issues Projects Releases Wiki Activity

Update rails to version 8.0.1 (#32357)

Browse Source
This commit is contained in:
Matt Jankowski 2025-01-03 11:08:21 -05:00 committed by GitHub
parent f9582bcfc3
commit 535866218e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -6,7 +6,7 @@ ruby '>= 3.2.0', '< 3.5'
gem 'propshaft' gem 'propshaft'
gem 'puma', '~> 6.3' gem 'puma', '~> 6.3'
gem 'rack', '~> 2.2.7' gem 'rack', '~> 2.2.7'
gem 'rails', '~> 7.2.0' gem 'rails', '~> 8.0'
gem 'thor', '~> 1.2' gem 'thor', '~> 1.2'
gem 'dotenv' gem 'dotenv'
@ -73,7 +73,7 @@ gem 'public_suffix', '~> 6.0'
gem 'pundit', '~> 2.3' gem 'pundit', '~> 2.3'
gem 'rack-attack', '~> 6.6' gem 'rack-attack', '~> 6.6'
gem 'rack-cors', '~> 2.0', require: 'rack/cors' gem 'rack-cors', '~> 2.0', require: 'rack/cors'
gem 'rails-i18n', '~> 7.0' gem 'rails-i18n', '~> 8.0'
gem 'redcarpet', '~> 3.6' gem 'redcarpet', '~> 3.6'
gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis'] gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
gem 'redis-namespace', '~> 1.10' gem 'redis-namespace', '~> 1.10'

118
Gemfile.lock
View File

@ -10,46 +10,45 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.2.2.1) actioncable (8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (7.2.2.1) actionmailbox (8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
activejob (= 7.2.2.1) activejob (= 8.0.1)
activerecord (= 7.2.2.1) activerecord (= 8.0.1)
activestorage (= 7.2.2.1) activestorage (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
mail (>= 2.8.0) mail (>= 2.8.0)
actionmailer (7.2.2.1) actionmailer (8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
actionview (= 7.2.2.1) actionview (= 8.0.1)
activejob (= 7.2.2.1) activejob (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
mail (>= 2.8.0) mail (>= 2.8.0)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (7.2.2.1) actionpack (8.0.1)
actionview (= 7.2.2.1) actionview (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
racc rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1) rack-session (>= 1.0.1)
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)
useragent (~> 0.16) useragent (~> 0.16)
actiontext (7.2.2.1) actiontext (8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
activerecord (= 7.2.2.1) activerecord (= 8.0.1)
activestorage (= 7.2.2.1) activestorage (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.2.2.1) actionview (8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
@ -59,22 +58,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.2.2.1) activejob (8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.2.2.1) activemodel (8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
activerecord (7.2.2.1) activerecord (8.0.1)
activemodel (= 7.2.2.1) activemodel (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (7.2.2.1) activestorage (8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
activejob (= 7.2.2.1) activejob (= 8.0.1)
activerecord (= 7.2.2.1) activerecord (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (7.2.2.1) activesupport (8.0.1)
base64 base64
benchmark (>= 0.3) benchmark (>= 0.3)
bigdecimal bigdecimal
@ -86,6 +85,7 @@ GEM
minitest (>= 5.1) minitest (>= 5.1)
securerandom (>= 0.3) securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5) tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7) addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0) public_suffix (>= 2.0.2, < 7.0)
aes_key_wrap (1.1.0) aes_key_wrap (1.1.0)
@ -613,20 +613,20 @@ GEM
rackup (1.0.1) rackup (1.0.1)
rack (< 3) rack (< 3)
webrick webrick
rails (7.2.2.1) rails (8.0.1)
actioncable (= 7.2.2.1) actioncable (= 8.0.1)
actionmailbox (= 7.2.2.1) actionmailbox (= 8.0.1)
actionmailer (= 7.2.2.1) actionmailer (= 8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
actiontext (= 7.2.2.1) actiontext (= 8.0.1)
actionview (= 7.2.2.1) actionview (= 8.0.1)
activejob (= 7.2.2.1) activejob (= 8.0.1)
activemodel (= 7.2.2.1) activemodel (= 8.0.1)
activerecord (= 7.2.2.1) activerecord (= 8.0.1)
activestorage (= 7.2.2.1) activestorage (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.2.2.1) railties (= 8.0.1)
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)
@ -638,12 +638,12 @@ GEM
rails-html-sanitizer (1.6.2) rails-html-sanitizer (1.6.2)
loofah (~> 2.21) loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (7.0.10) rails-i18n (8.0.1)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8) railties (>= 8.0.0, < 9)
railties (7.2.2.1) railties (8.0.1)
actionpack (= 7.2.2.1) actionpack (= 8.0.1)
activesupport (= 7.2.2.1) activesupport (= 8.0.1)
irb (~> 1.13) irb (~> 1.13)
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
@ -986,9 +986,9 @@ DEPENDENCIES
rack-attack (~> 6.6) rack-attack (~> 6.6)
rack-cors (~> 2.0) rack-cors (~> 2.0)
rack-test (~> 2.1) rack-test (~> 2.1)
rails (~> 7.2.0) rails (~> 8.0)
rails-controller-testing (~> 1.0) rails-controller-testing (~> 1.0)
rails-i18n (~> 7.0) rails-i18n (~> 8.0)
rdf-normalize (~> 0.5) rdf-normalize (~> 0.5)
redcarpet (~> 3.6) redcarpet (~> 3.6)
redis (~> 4.5) redis (~> 4.5)

2
config/application.rb
View File

@ -59,7 +59,7 @@ Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
module Mastodon module Mastodon
class Application < Rails::Application class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version. # Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.2 config.load_defaults 8.0
# Please, add to the `ignore` list any other `lib` subdirectories that do # Please, add to the `ignore` list any other `lib` subdirectories that do
# not contain `.rb` files, or that should not be reloaded or eager loaded. # not contain `.rb` files, or that should not be reloaded or eager loaded.

2
config/initializers/filter_parameter_logging.rb
View File

@ -6,5 +6,5 @@
# Use this to limit dissemination of sensitive information. # Use this to limit dissemination of sensitive information.
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors. # See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
Rails.application.config.filter_parameters += [ Rails.application.config.filter_parameters += [
:passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
] ]

4
lib/active_record/batches.rb
View File

@ -13,7 +13,9 @@ module ActiveRecord
column_names.unshift(primary_key) column_names.unshift(primary_key)
relation = relation.reorder(build_batch_orders(order).to_h).limit(batch_limit) cursor = Array(primary_key)
relation = relation.reorder(build_batch_orders(cursor, order).to_h).limit(batch_limit)
relation.skip_query_cache! relation.skip_query_cache!
batch_relation = relation batch_relation = relation

5
spec/rails_helper.rb
View File

@ -119,6 +119,11 @@ RSpec.configure do |config|
config.include CommandLineHelpers, type: :cli config.include CommandLineHelpers, type: :cli
config.include SystemHelpers, type: :system config.include SystemHelpers, type: :system
# TODO: Remove when Devise fixes https://github.com/heartcombo/devise/issues/5705
config.before do
Rails.application.reload_routes_unless_loaded
end
config.around(:each, use_transactional_tests: false) do |example| config.around(:each, use_transactional_tests: false) do |example|
self.use_transactional_tests = false self.use_transactional_tests = false
example.run example.run