From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 18 Mar 2019 17:03:27 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=291012ec0c08f5323b2102eb4d2dc8714ddce4d9;p=mastodon.git

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.
---

291012ec0c08f5323b2102eb4d2dc8714ddce4d9
diff --cc app/controllers/accounts_controller.rb
index 157ea8569,abc68d2a4..fcdebb47f
--- a/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/follower_accounts_controller.rb
index f985f0eff,aea42bd63..213c209ab
--- a/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/statuses_controller.rb
index 6f56a67ba,fc44d5fb1..53cf1c4ca
--- a/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