Commit c5d97c7e authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

COPYING is now also accepted as licence file

Fixes #2526
parent a2f0a365
...@@ -90,6 +90,8 @@ v 8.0.1 ...@@ -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)
......
...@@ -210,9 +210,9 @@ class Repository ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment