diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-31 22:11:48 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-31 22:11:48 +0300 |
| commit | f06daa26efc127565e4e68ca9d4ac62e5a1e3b36 (patch) | |
| tree | e212d23f502d60b29d89dc5151d22b246d15d953 /lib/gitlab/etag_caching | |
| parent | 87e761da9222f277bdc5a638c54d30192abe2779 (diff) | |
| parent | 61227393dc1bc8240b7e9413a613f7aacdaed2c2 (diff) | |
Merge branch 'rename-builds-controller' into 'master'
Rename BuildsController to JobsController
Closes #30699
See merge request !11407
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 cc285162b44..d137cc1bae6 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].freeze RESERVED_WORDS = Gitlab::PathRegex::ILLEGAL_PROJECT_PATH_WORDS - USED_IN_ROUTES - RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS) + RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS.map(&Regexp.method(:escape))) ROUTES = [ Gitlab::EtagCaching::Router::Route.new( %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/noteable/issue/\d+/notes\z), |