Merge branch 'ab-45247-project-lookups-validation' into 'master'

Validate project path prior to hitting the database.

Closes #45247

See merge request gitlab-org/gitlab-ce!18322

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 61dab1dd5cb..b8657cd7ee4 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -103,9 +103,9 @@ module API
     end
 
     def find_project(id)
-      if id =~ /^\d+$/
+      if id.is_a?(Integer) || id =~ /^\d+$/
         Project.find_by(id: id)
-      else
+      elsif id.include?("/")
         Project.find_by_full_path(id)
       end
     end