diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/constraints/group_url_constrainer.rb | 2 | ||||
| -rw-r--r-- | lib/constraints/project_url_constrainer.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/etag_caching/router.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/constraints/group_url_constrainer.rb b/lib/constraints/group_url_constrainer.rb index 559f510944a..48a33690cb2 100644 --- a/lib/constraints/group_url_constrainer.rb +++ b/lib/constraints/group_url_constrainer.rb @@ -2,7 +2,7 @@ class GroupUrlConstrainer def matches?(request) id = request.params[:id] - return false unless NamespaceValidator.valid_full_path?(id) + return false unless DynamicPathValidator.valid_full_path?(id) Group.find_by_full_path(id).present? end diff --git a/lib/constraints/project_url_constrainer.rb b/lib/constraints/project_url_constrainer.rb index f83fa1618a5..72c457d0369 100644 --- a/lib/constraints/project_url_constrainer.rb +++ b/lib/constraints/project_url_constrainer.rb @@ -4,7 +4,7 @@ class ProjectUrlConstrainer project_path = request.params[:project_id] || request.params[:id] full_path = namespace_path + '/' + project_path - unless NamespaceValidator.valid_full_path?(full_path) + unless DynamicPathValidator.valid_full_path?(full_path) return false end diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb index 67aa237f2f1..c7da8b07a56 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`/rendered_title` for the `issue_title` route USED_IN_ROUTES = %w[noteable issue notes issues renderred_title commit pipelines merge_requests new].freeze - RESERVED_WORDS = NamespaceValidator::WILDCARD_ROUTES - USED_IN_ROUTES + RESERVED_WORDS = DynamicPathValidator::WILDCARD_ROUTES - USED_IN_ROUTES RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS) ROUTES = [ Gitlab::EtagCaching::Router::Route.new( |