diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-20 03:46:40 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-24 04:38:24 +0300 |
| commit | 4345bb8c507a11af694617187dea14284f48fb96 (patch) | |
| tree | 20bc96bf6f90f8654492fb4e8b5cb1108e3d131d /lib/gitlab/etag_caching | |
| parent | 3cfcbcf35badfdb21244f7f16c8640cd83b49205 (diff) | |
Fix ambiguous routing issues by teaching router about reserved words
Diffstat (limited to 'lib/gitlab/etag_caching')
| -rw-r--r-- | lib/gitlab/etag_caching/router.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb index ba31041d0c1..7d03209684a 100644 --- a/lib/gitlab/etag_caching/router.rb +++ b/lib/gitlab/etag_caching/router.rb @@ -10,7 +10,7 @@ module Gitlab # - Ending in `issues/id`/realtime_changes` for the `issue_title` route USED_IN_ROUTES = %w[noteable issue notes issues realtime_changes commit pipelines merge_requests new].freeze - RESERVED_WORDS = DynamicPathValidator::WILDCARD_ROUTES - USED_IN_ROUTES + RESERVED_WORDS = Gitlab::PathRegex::ILLEGAL_PROJECT_PATH_WORDS - USED_IN_ROUTES RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS) ROUTES = [ Gitlab::EtagCaching::Router::Route.new( |