diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-24 18:08:05 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-24 18:08:05 +0300 |
| commit | 2a6227a9fca46ca5c982f1cb75754fb1c722b360 (patch) | |
| tree | e1f1c3386336fdd24f6445134989161b3681c17b /lib/gitlab/etag_caching | |
| parent | 03bd3081cafe249d9e8c73999411ce9999466c37 (diff) | |
| parent | b0498c176fa134761d899c9b369be12f1ca789c5 (diff) | |
Merge branch 'dm-fix-routes' into 'master'
Fix ambiguous routing issues by teaching router about reserved words
See merge request !11570
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 bdf885559c5..2b0e19b338b 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::Regex::ILLEGAL_PROJECT_PATH_WORDS - USED_IN_ROUTES RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS) ROUTES = [ Gitlab::EtagCaching::Router::Route.new( |