From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 10 May 2019 15:09:12 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=68629f2773a056b0120b956e0cb425e73fe57cab;p=mastodon.git

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

68629f2773a056b0120b956e0cb425e73fe57cab
diff --cc app/controllers/statuses_controller.rb
index 53cf1c4ca,e60646ba3..28eebda28
--- a/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
 +        use_pack 'public'
-         mark_cacheable! unless user_signed_in?
++
+         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 8cb54a148,b75cefa74..1e16c5157
--- a/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