diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 14:57:22 +0300 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 14:57:22 +0300 |
| commit | 7ec89692858a207691489aed566af7785a923895 (patch) | |
| tree | dfad4c6ea77f322b68db974102c5ec54fe0366f6 /lib/gitlab/etag_caching | |
| parent | 2f62af684e127010cffd81e027f469dcde3bc9b2 (diff) | |
| parent | 78de1c059ac588df4ba1ef352b28e5b1c6102804 (diff) | |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'lib/gitlab/etag_caching')
| -rw-r--r-- | lib/gitlab/etag_caching/router.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb index 9deca760469..cf279628beb 100644 --- a/lib/gitlab/etag_caching/router.rb +++ b/lib/gitlab/etag_caching/router.rb @@ -11,7 +11,7 @@ module Gitlab USED_IN_ROUTES = %w[noteable issue notes issues realtime_changes commit pipelines merge_requests new environments].freeze - RESERVED_WORDS = DynamicPathValidator::WILDCARD_ROUTES - USED_IN_ROUTES + RESERVED_WORDS = Gitlab::Regex::ILLEGAL_PROJECT_PATH_WORDS - USED_IN_ROUTES RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS) ROUTES = [ Gitlab::EtagCaching::Router::Route.new( @@ -39,7 +39,7 @@ module Gitlab 'project_pipelines' ), Gitlab::EtagCaching::Router::Route.new( - %r(^(?!.*(#{RESERVED_WORDS})).*/pipelines/\d+\.json\z), + %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/pipelines/\d+\.json\z), 'project_pipeline' ), Gitlab::EtagCaching::Router::Route.new( |