summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-08 18:50:23 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-10 20:07:04 -0500
commit08706f683725dcfbda1708ddf079347d989fbef1 (patch)
tree91cbd54eac137206b85908361ceee41ae9671102 /app/helpers
parent62c93ab91218daf176ccbfc1622a6f3c58f1ad82 (diff)
downloadgitlab-ce-08706f683725dcfbda1708ddf079347d989fbef1.tar.gz
Implement auxiliary blob viewers
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/projects_helper.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 8c26348a975..78b54dc20e5 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -110,11 +110,8 @@ module ProjectsHelper
end
def license_short_name(project)
- return 'LICENSE' if project.repository.license_key.nil?
-
- license = Licensee::License.new(project.repository.license_key)
-
- license.nickname || license.name
+ license = project.repository.license
+ license&.nickname || license&.name || 'LICENSE'
end
def last_push_event