diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 12:08:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 12:08:13 +0300 |
commit | 8e94dad32b10edebf79285c083176c2b7005ef64 (patch) | |
tree | 3bb66395f2962063ca0d20f98b35ac852d801c7e /lib/banzai | |
parent | ab128cc125f9db0c3a1bd48845f90c3d61ef42c9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/repository_link_filter.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/banzai/filter/repository_link_filter.rb b/lib/banzai/filter/repository_link_filter.rb index d448238c6e4..e15201b05cb 100644 --- a/lib/banzai/filter/repository_link_filter.rb +++ b/lib/banzai/filter/repository_link_filter.rb @@ -80,6 +80,13 @@ module Banzai end Gitlab::GitalyClient::BlobService.new(repository).get_blob_types(revision_paths, 1) + rescue GRPC::Unavailable, GRPC::DeadlineExceeded => e + # Handle Gitaly connection issues gracefully + Gitlab::ErrorTracking.track_exception(e, project_id: project.id) + # Return all links as blob types + paths.collect do |path| + [path, :blob] + end end def get_uri(html_attr) |