diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-18 18:52:06 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-18 18:52:06 +0000 |
| commit | 57fde5a83e717db861b025193fdf04e9f087e148 (patch) | |
| tree | aa913d3711ef4bf918bd2ce249e24885c9ce9abd /app/helpers | |
| parent | 08fddae7441ce9ac61bc80e5b93a2eafb8441430 (diff) | |
| parent | 4e58aa40b98aa1cb758b1386b961f3bf15671bd7 (diff) | |
| download | gitlab-ce-57fde5a83e717db861b025193fdf04e9f087e148.tar.gz | |
Merge branch '15584-remove-back-compat-code' into 'master'
Remove back-compat code that's not needed anymore
Solves #15584.
See merge request !4187
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a140bbc3c67..0825b5b6437 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -124,11 +124,7 @@ module ProjectsHelper end def license_short_name(project) - no_license_key = project.repository.license_key.nil? || - # Back-compat if cache contains 'no-license', can be removed in a few weeks - project.repository.license_key == 'no-license' - - return 'LICENSE' if no_license_key + return 'LICENSE' if project.repository.license_key.nil? license = Licensee::License.new(project.repository.license_key) |