diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-04-05 15:48:05 +0200 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-04-05 15:48:05 +0200 |
| commit | 63a6453c0136a6244b0351ab6350dcee62a45cf9 (patch) | |
| tree | abd9eb8a154091a8d97d10cb0c9f797eec2e6efa | |
| parent | d4349ba6c4960f50dce7b0beec5f309894dbada9 (diff) | |
| download | gitlab-ce-wildcard-routes-in-etag-middleware.tar.gz | |
Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middlewarewildcard-routes-in-etag-middleware
NamespaceValidator::WILDCARD_ROUTES is less restrictive than
ProjectPathValidator::RESERVED and we really have to avoid only
routes that contain wildcard names.
| -rw-r--r-- | lib/gitlab/etag_caching/middleware.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) ) |