diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-09-21 10:14:38 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-10-14 17:59:01 +0200 |
| commit | 9ec32b1cacdd411cbdcc262f7b327c6bfc552735 (patch) | |
| tree | 070d4dcd0e7399b0c54f3bb9666f1a995e8611c1 | |
| parent | c5d97c7e37fbfc4ed478da24d64d54c770ed2097 (diff) | |
| download | gitlab-ce-9ec32b1cacdd411cbdcc262f7b327c6bfc552735.tar.gz | |
Prefer Licence over Copying
| -rw-r--r-- | app/models/repository.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index cc46ab916c7..dc7cd926745 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -210,9 +210,13 @@ class Repository def license cache.fetch(:license) do - tree(:head).blobs.find_all do |file| - file.name =~ /\A(copying|license)/i - end.last # Prefer `LICENSE` as filename over `COPYING` + licenses = tree(:head).blobs.find_all do |file| + file.name =~ /\A(copying|license)/i + end + + # If `licence`, `copying` and `copying.lesser` are found, return in the + # following order: licence, copying, copying.lesser + licenses.find { |l| l =~ /\Alicence/i } || licenses.sort.first end end |