summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-03-01 15:30:41 +0100
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-03-01 16:41:08 +0100
commit34fbade4ae67b56061da89fc881781352880b4ed (patch)
tree9544b4ed3ed7abc025837c4bd064a06e2a24a08d /app/models/repository.rb
parente66e776772c70b07d403b2124e9ef458e85db726 (diff)
downloadgitlab-ce-34fbade4ae67b56061da89fc881781352880b4ed.tar.gz
Client implementation for Licensee#key
Part of the migration as tracked in: gitlab-org/gitaly#1026
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 299a3f32a85..fd881bea612 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -589,15 +589,7 @@ class Repository
def license_key
return unless exists?
- # The licensee gem creates a Rugged object from the path:
- # https://github.com/benbalter/licensee/blob/v8.7.0/lib/licensee/projects/git_project.rb
- begin
- Licensee.license(path).try(:key)
- # 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
+ raw_repository.license_short_name
end
cache_method :license_key