Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system

diff --cc .env.production.sample
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/statuses_controller.rb
index 53cf1c4cade5f6e3a5a7f6ee2774ba2f46a97eff,e60646ba33848c439e61869767e102266ab09bd4..28eebda28b39fadfc199193ea901ee731bb88317
--- 1/app/controllers/statuses_controller.rb
--- 2/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@@ -27,8 -27,10 +27,12 @@@ class StatusesController < ApplicationC
    def show
      respond_to do |format|
        format.html do
-         mark_cacheable! unless user_signed_in?
 +        use_pack 'public'
++
+         unless user_signed_in?
+           skip_session!
+           expires_in 10.seconds, public: true
+         end
  
          @body_classes = 'with-modals'
  

diff --cc app/controllers/stream_entries_controller.rb
index 8cb54a1487127fe6230e1b0d717a8e786e64fcd9,b75cefa74c4bfee6e2cba423b98c7140efd00230..1e16c5157d73fa9c110b9249f8cd6376ff7668fb
--- 1/app/controllers/stream_entries_controller.rb
--- 2/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@@ -15,7 -15,11 +15,13 @@@ class StreamEntriesController < Applica
    def show
      respond_to do |format|
        format.html do
 +        use_pack 'public'
++
+         unless user_signed_in?
+           skip_session!
+           expires_in 5.minutes, public: true
+         end
+ 
          redirect_to short_account_status_url(params[:account_username], @stream_entry.activity) if @type == 'status'
        end
  

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge