diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
| commit | e3bac7dffe87a6e5adb1b51700acedba09420515 (patch) | |
| tree | 3cad0696bdfeb79609c0442f79708fbbed2d93f1 /app/helpers/projects_helper.rb | |
| parent | f4b6bc06da18bce9553032463ca2012d7cad7268 (diff) | |
| parent | e7e132529bff3af38175076b84c818b6dea4b05f (diff) | |
| download | gitlab-ce-sh-ajax-tests.tar.gz | |
Merge branch 'master' into sh-ajax-testssh-ajax-tests
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 7 |
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 |