Merge branch 'sh-fix-error-500-no-avatars' into 'master'

Fix Error 500 when repository has no avatar

Closes #42249

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

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb
index 031fccba92b..f421bf69e8f 100644
--- a/lib/gitlab/git/blob.rb
+++ b/lib/gitlab/git/blob.rb
@@ -132,6 +132,8 @@ module Gitlab
         end
 
         def find_by_gitaly(repository, sha, path, limit: MAX_DATA_DISPLAY_SIZE)
+          return unless path
+
           path = path.sub(/\A\/*/, '')
           path = '/' if path.empty?
           name = File.basename(path)
@@ -173,6 +175,8 @@ module Gitlab
         end
 
         def find_by_rugged(repository, sha, path, limit:)
+          return unless path
+
           rugged_commit = repository.lookup(sha)
           root_tree = rugged_commit.tree