diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 14:09:20 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 14:09:20 +0300 |
commit | 2f22890d4223c0b524ee1f27e222a24a8f0c9a87 (patch) | |
tree | 79609a077a37cc49d95463b649ff4098cea10b4d /lib/gitlab | |
parent | 907b754173ed4185574c38ded0a173360d073085 (diff) | |
parent | fb7b0d6e710d462f5bef1df3195fa8b051668bfc (diff) |
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/etag_caching/middleware.rb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb index 630fe4fa849..11167632e07 100644 --- a/lib/gitlab/etag_caching/middleware.rb +++ b/lib/gitlab/etag_caching/middleware.rb @@ -10,6 +10,22 @@ module Gitlab { regexp: %r(^(?!.*(#{RESERVED_WORDS})).*/issues/\d+/rendered_title\z), name: 'issue_title' + }, + { + regexp: %r(^(?!.*(#{RESERVED_WORDS})).*/pipelines\.json\z), + name: 'project_pipelines' + }, + { + regexp: %r(^(?!.*(#{RESERVED_WORDS})).*/commit/\s+/pipelines\.json\z), + name: 'commit_pipelines' + }, + { + regexp: %r(^(?!.*(#{RESERVED_WORDS})).*/merge_requests/new\.json\z), + name: 'new_merge_request_pipelines' + }, + { + regexp: %r(^(?!.*(#{RESERVED_WORDS})).*/merge_requests/\d+/pipelines\.json\z), + name: 'merge_request_pipelines' } ].freeze @@ -65,7 +81,7 @@ module Gitlab status_code = Gitlab::PollingInterval.polling_enabled? ? 304 : 429 - [status_code, { 'ETag' => etag }, ['']] + [status_code, { 'ETag' => etag }, []] end def track_cache_miss(if_none_match, cached_value_present, route) |