From 3d1f123313fc350f217081c6ccf38169420bf92d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Nov 2023 06:09:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/api/helpers.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/api/helpers.rb') diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index bb94d5d14d0..7c57666b843 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -146,7 +146,7 @@ module API if id.is_a?(Integer) || id =~ INTEGER_ID_REGEX projects.find_by(id: id) elsif id.include?("/") - projects.find_by_full_path(id, follow_redirects: Feature.enabled?(:api_redirect_moved_projects)) + projects.find_by_full_path(id, follow_redirects: true) end end # rubocop: enable CodeReuse/ActiveRecord @@ -905,7 +905,6 @@ module API end def project_moved?(id, project) - return false unless Feature.enabled?(:api_redirect_moved_projects) return false unless id.is_a?(String) && id.include?('/') return false if project.blank? || project.full_path.casecmp?(id) return false unless params[:id] == id -- cgit v1.2.3