Merge branch 'tz-user-avatar-caching' into 'master'

Changed the Caching of User Avatars to be public and to 5 minutes

See merge request gitlab-org/gitlab-ce!24546

2 files changed, 15 insertions, 1 deletions

diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb
index c114e16edf8..4ec0e94df9a 100644
--- a/app/controllers/concerns/uploads_actions.rb
+++ b/app/controllers/concerns/uploads_actions.rb
@@ -29,7 +29,13 @@ module UploadsActions
   def show
     return render_404 unless uploader&.exists?
 
-    expires_in 0.seconds, must_revalidate: true, private: true
+    if cache_publicly?
+      # We need to reset caching from the applications controller to get rid of the no-store value
+      headers['Cache-Control'] = ''
+      expires_in 5.minutes, public: true, must_revalidate: false
+    else
+      expires_in 0.seconds, must_revalidate: true, private: true
+    end
 
     disposition = uploader.image_or_video? ? 'inline' : 'attachment'
 
@@ -114,6 +120,10 @@ module UploadsActions
     nil
   end
 
+  def cache_publicly?
+    false
+  end
+
   def model
     strong_memoize(:model) { find_model }
   end
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index fa5d84633b5..519e7439205 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -70,6 +70,10 @@ class UploadsController < ApplicationController
     end
   end
 
+  def cache_publicly?
+    User === model || Appearance === model
+  end
+
   def upload_model_class
     MODEL_CLASSES[params[:model]] || raise(UnknownUploadModelError)
   end