Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb
index 81cfce6a3db..fc3c05c57b2 100644
--- a/lib/gitlab/etag_caching/middleware.rb
+++ b/lib/gitlab/etag_caching/middleware.rb
@@ -3,6 +3,14 @@
 module Gitlab
   module EtagCaching
     class Middleware
+      SKIP_HEADER_KEY = 'X-Gitlab-Skip-Etag'
+
+      class << self
+        def skip!(response)
+          response.set_header(SKIP_HEADER_KEY, '1')
+        end
+      end
+
       def initialize(app)
         @app = app
       end
@@ -22,9 +30,7 @@ module Gitlab
         else
           track_cache_miss(if_none_match, cached_value_present, route)
 
-          status, headers, body = @app.call(env)
-          headers['ETag'] = etag
-          [status, headers, body]
+          maybe_apply_etag(etag, *@app.call(env))
         end
       end
 
@@ -43,6 +49,13 @@ module Gitlab
         [weak_etag_format(current_value), cached_value_present]
       end
 
+      def maybe_apply_etag(etag, status, headers, body)
+        headers['ETag'] = etag unless
+          Gitlab::Utils.to_boolean(headers.delete(SKIP_HEADER_KEY))
+
+        [status, headers, body]
+      end
+
       def weak_etag_format(value)
         %Q{W/"#{value}"}
       end