summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-02-14 13:26:50 -0800
committerStan Hu <stanhu@gmail.com>2018-02-14 13:26:50 -0800
commitbc11af6758264c7cbebb2c3dccff0f754b3555d8 (patch)
tree7a0ab2b171b8ddfc0c00734ca11b8bb01c9a6df4
parent35b3a0b967399d0b4340325d067592c166f208e5 (diff)
downloadgitlab-ce-bc11af6758264c7cbebb2c3dccff0f754b3555d8.tar.gz
Remove use of catching Rugged exceptions
-rw-r--r--app/models/repository.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index eef187b623b..7d719c5e1a1 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -598,7 +598,10 @@ class Repository
# https://github.com/benbalter/licensee/blob/v8.7.0/lib/licensee/projects/git_project.rb
begin
Licensee.project(path, revision: head_commit.sha).license.try(:key)
- rescue Rugged::Error
+ # Normally we would rescue Rugged::Error, but that is banned by lint-rugged
+ # and we need to migrate this endpoint to Gitaly:
+ # https://gitlab.com/gitlab-org/gitaly/issues/1026
+ rescue
end
end
cache_method :license_key