From d8ccc7a00b7a1ea954263170a2044257424a2cfe Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 7 Nov 2019 18:06:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/constraints/project_url_constrainer.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'lib/constraints') diff --git a/lib/constraints/project_url_constrainer.rb b/lib/constraints/project_url_constrainer.rb index d41490d2ebd..64eefd67d81 100644 --- a/lib/constraints/project_url_constrainer.rb +++ b/lib/constraints/project_url_constrainer.rb @@ -2,17 +2,12 @@ module Constraints class ProjectUrlConstrainer - def matches?(request, existence_check: true) + def matches?(request) namespace_path = request.params[:namespace_id] project_path = request.params[:project_id] || request.params[:id] full_path = [namespace_path, project_path].join('/') - return false unless ProjectPathValidator.valid_path?(full_path) - return true unless existence_check - - # We intentionally allow SELECT(*) here so result of this query can be used - # as cache for further Project.find_by_full_path calls within request - Project.find_by_full_path(full_path, follow_redirects: request.get?).present? + ProjectPathValidator.valid_path?(full_path) end end end -- cgit v1.2.3