diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-15 16:27:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-15 16:27:23 +0000 |
| commit | 84199f19197583da44471a6b7f91694b7f4645df (patch) | |
| tree | d145a2353e7488ef486ad41f64a7e0813cc5b348 /lib | |
| parent | afcc81da653b35b8061b69db87315f0a1f77f263 (diff) | |
| parent | 3efb60642a1803adbe8dccfc684ce1771765b750 (diff) | |
| download | gitlab-ce-84199f19197583da44471a6b7f91694b7f4645df.tar.gz | |
Merge branch 'rename-rendered_title' into 'master'
Rename all references to rendered_title to realtime_changes
See merge request !11359
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/etag_caching/router.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb index 31a5b9d108b..ba31041d0c1 100644 --- a/lib/gitlab/etag_caching/router.rb +++ b/lib/gitlab/etag_caching/router.rb @@ -7,8 +7,8 @@ module Gitlab # - Don't contain a reserved word (expect for the words used in the # regex itself) # - Ending in `noteable/issue/<id>/notes` for the `issue_notes` route - # - Ending in `issues/id`/rendered_title` for the `issue_title` route - USED_IN_ROUTES = %w[noteable issue notes issues rendered_title + # - 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_REGEX = Regexp.union(*RESERVED_WORDS) @@ -18,7 +18,7 @@ module Gitlab 'issue_notes' ), Gitlab::EtagCaching::Router::Route.new( - %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/issues/\d+/rendered_title\z), + %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/issues/\d+/realtime_changes\z), 'issue_title' ), Gitlab::EtagCaching::Router::Route.new( |