diff options
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 47988d9d0..f72cc8e11 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,9 +35,11 @@ require_relative '../lib/terrapin/multi_pipe_extensions' require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/version' require_relative '../lib/mastodon/rack_middleware' +require_relative '../lib/public_file_server_middleware' require_relative '../lib/devise/two_factor_ldap_authenticatable' require_relative '../lib/devise/two_factor_pam_authenticatable' require_relative '../lib/chewy/strategy/mastodon' +require_relative '../lib/chewy/strategy/bypass_with_warning' require_relative '../lib/webpacker/manifest_extensions' require_relative '../lib/webpacker/helper_extensions' require_relative '../lib/rails/engine_extensions' @@ -69,12 +71,14 @@ module Mastodon # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.available_locales = [ :af, + :an, :ar, :ast, :be, :bg, :bn, :br, + :bs, :ca, :ckb, :co, @@ -85,6 +89,7 @@ module Mastodon :el, :en, :'en-cafe', + :'en-GB', :eo, :es, :'es-AR', @@ -93,7 +98,9 @@ module Mastodon :eu, :fa, :fi, + :fo, :fr, + :'fr-QC', :fy, :ga, :gd, @@ -104,6 +111,7 @@ module Mastodon :hu, :hy, :id, + :ig, :io, :is, :it, @@ -114,16 +122,20 @@ module Mastodon :kn, :ko, :ku, + :kw, + :la, :lt, :lv, :mk, :ml, :mr, :ms, + :my, :nl, :nn, :no, :oc, + :pa, :pl, :'pt-BR', :'pt-PT', @@ -131,6 +143,7 @@ module Mastodon :ru, :sa, :sc, + :sco, :si, :sk, :sl, @@ -138,10 +151,14 @@ module Mastodon :sr, :'sr-Latn', :sv, + :szl, :ta, + :tai, :te, :th, :tr, + :tt, + :ug, :uk, :ur, :vi, @@ -170,6 +187,10 @@ module Mastodon config.active_job.queue_adapter = :sidekiq config.action_mailer.deliver_later_queue_name = 'mailers' + # We use our own middleware for this + config.public_file_server.enabled = false + + config.middleware.use PublicFileServerMiddleware if Rails.env.development? || ENV['RAILS_SERVE_STATIC_FILES'] == 'true' config.middleware.use Rack::Attack config.middleware.use Mastodon::RackMiddleware |