kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

COPYING is now also accepted as licence file

Browse source 
Fixes #2526
This commit is contained in:
Zeger-Jan van de Weg 2015-09-19 13:33:28 +02:00
parent a2f0a3650b
commit c5d97c7e37
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -90,6 +90,8 @@ v 8.0.1
v 8.0.0 v 8.0.0
- Fix Markdown links not showing up in dashboard activity feed (Stan Hu) - Fix Markdown links not showing up in dashboard activity feed (Stan Hu)
- Remove milestones from merge requests when milestones are deleted (Stan Hu) - Remove milestones from merge requests when milestones are deleted (Stan Hu)
v 8.0.0 (unreleased)
- Accept COPYING as licence file (Zeger-Jan van de Weg)
- Fix HTML link that was improperly escaped in new user e-mail (Stan Hu) - Fix HTML link that was improperly escaped in new user e-mail (Stan Hu)
- Fix broken sort in merge request API (Stan Hu) - Fix broken sort in merge request API (Stan Hu)
- Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu) - Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)

6
app/models/repository.rb
View file

@ -210,9 +210,9 @@ class Repository
def license def license
cache.fetch(:license) do cache.fetch(:license) do
tree(:head).blobs.find do |file| tree(:head).blobs.find_all do |file|
file.name =~ /\Alicense/i file.name =~ /\A(copying|license)/i
end end.last # Prefer `LICENSE` as filename over `COPYING`
end end
end end