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

Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/accounts_controller.rb
index 157ea8569691d85b7be220f282722d904a5886f7,abc68d2a464f20f7dd39fef9db31d8a9bcb6ded5..fcdebb47f14ac7c3f8886222b6fd8b3ee6b27f1d
--- 1/app/controllers/accounts_controller.rb
--- 2/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@@ -10,7 -10,8 +10,9 @@@ class AccountsController < ApplicationC
    def show
      respond_to do |format|
        format.html do
 +        use_pack 'public'
+         mark_cacheable! unless user_signed_in?
+ 
          @body_classes      = 'with-modals'
          @pinned_statuses   = []
          @endorsed_accounts = @account.endorsed_accounts.to_a.sample(4)
@@@ -31,8 -32,10 +33,10 @@@
        end
  
        format.atom do
+         mark_cacheable!
+ 
          @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(PAGE_SIZE, params[:max_id], params[:since_id])
 -        render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.reject { |entry| entry.status.nil? }))
 +        render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.reject { |entry| entry.status.nil? || entry.status.local_only? }))
        end
  
        format.rss do

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/controllers/follower_accounts_controller.rb
index f985f0effab6987b5ec43282d5333dbe10082ff5,aea42bd632ea8b346c294dbae577294e791d9556..213c209abdbef3ba283e4f23767f8f66a3df0000
--- 1/app/controllers/follower_accounts_controller.rb
--- 2/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@@ -6,7 -6,7 +6,8 @@@ class FollowerAccountsController < Appl
    def index
      respond_to do |format|
        format.html do
 +        use_pack 'public'
+         mark_cacheable! unless user_signed_in?
  
          next if @account.user_hides_network?
  

diff --cc app/controllers/relationships_controller.rb
Simple merge

diff --cc app/controllers/statuses_controller.rb
index 6f56a67baf0e147a5510a055dc9046ca84dd6ec9,fc44d5fb1d09cdc37441f906ec097cadb35cf602..53cf1c4cade5f6e3a5a7f6ee2774ba2f46a97eff
--- 1/app/controllers/statuses_controller.rb
--- 2/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@@ -27,7 -27,8 +27,9 @@@ class StatusesController < ApplicationC
    def show
      respond_to do |format|
        format.html do
 +        use_pack 'public'
+         mark_cacheable! unless user_signed_in?
+ 
          @body_classes = 'with-modals'
  
          set_ancestors

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/models/status.rb
Simple merge

diff --cc app/views/relationships/show.html.haml
Simple merge

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

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

diff --cc db/schema.rb
Simple merge