Merge branch 'wildcard-routes-in-etag-middleware' into 'master'

Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware See merge request !10478

Merge branch 'wildcard-routes-in-etag-middleware' into 'master'
32e9e24a · Sean McGivern · 7196adaa · 63a6453c · 32e9e24a
Commit 32e9e24a authored Apr 05, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

middleware.rb lib/gitlab/etag_caching/middleware.rb +1 -1

No files found.
--- a/lib/gitlab/etag_caching/middleware.rb
+++ b/lib/gitlab/etag_caching/middleware.rb
 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)
      )