Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Rails 7.1 update (#25963)

Browse source
This commit is contained in:
Matt Jankowski 2023-10-23 13:58:29 -04:00 • committed by GitHub
parent 379115e601
commit e93a75f1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 122 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/application.rb
View file

@ -196,7 +196,7 @@ module Mastodon
config.active_job.queue_adapter = :sidekiq
config.action_mailer.deliver_later_queue_name = 'mailers'
config.action_mailer.preview_path = Rails.root.join('spec', 'mailers', 'previews')
config.action_mailer.preview_paths << Rails.root.join('spec', 'mailers', 'previews')
# We use our own middleware for this
config.public_file_server.enabled = false
@ -205,6 +205,10 @@ module Mastodon
config.middleware.use Rack::Attack
config.middleware.use Mastodon::RackMiddleware
initializer :deprecator do |app|
app.deprecators[:mastodon] = ActiveSupport::Deprecation.new('4.3', 'mastodon/mastodon')
end
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'modal'
Doorkeeper::AuthorizedApplicationsController.layout 'admin'