Merge tag 'v4.1.8' into chinwag-4.1

config/application.rb

@@ -22,7 +22,6 @@ require 'mail'
 Bundler.require(*Rails.groups)
 
 require_relative '../lib/exceptions'
-require_relative '../lib/enumerable'
 require_relative '../lib/sanitize_ext/sanitize_config'
 require_relative '../lib/redis/namespace_extensions'
 require_relative '../lib/paperclip/url_generator_extensions'
@@ -37,6 +36,7 @@ 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'
@@ -72,11 +72,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,
@@ -86,6 +89,7 @@ module Mastodon
       :de,
       :el,
       :en,
+      :'en-GB',
       :eo,
       :es,
       :'es-AR',
@@ -94,7 +98,10 @@ module Mastodon
       :eu,
       :fa,
       :fi,
+      :fo,
       :fr,
+      :'fr-QC',
+      :fy,
       :ga,
       :gd,
       :gl,
@@ -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,
@@ -171,6 +188,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