From 63a6453c0136a6244b0351ab6350dcee62a45cf9 Mon Sep 17 00:00:00 2001 From: Adam Niedzielski Date: Wed, 5 Apr 2017 15:48:05 +0200 Subject: Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware NamespaceValidator::WILDCARD_ROUTES is less restrictive than ProjectPathValidator::RESERVED and we really have to avoid only routes that contain wildcard names. --- lib/gitlab/etag_caching/middleware.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/etag_caching') diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb index 9c98f0d1a30..ab8dfc67880 100644 --- a/lib/gitlab/etag_caching/middleware.rb +++ b/lib/gitlab/etag_caching/middleware.rb @@ -1,7 +1,7 @@ module Gitlab module EtagCaching class Middleware - RESERVED_WORDS = ProjectPathValidator::RESERVED.map { |word| "/#{word}/" }.join('|') + RESERVED_WORDS = NamespaceValidator::WILDCARD_ROUTES.map { |word| "/#{word}/" }.join('|') ROUTE_REGEXP = Regexp.union( %r(^(?!.*(#{RESERVED_WORDS})).*/noteable/issue/\d+/notes\z) ) -- cgit v1.2.3