Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
9ec32b1c
Commit
9ec32b1c
authored
Sep 21, 2015
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prefer Licence over Copying
parent
c5d97c7e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
app/models/repository.rb
app/models/repository.rb
+7
-3
No files found.
app/models/repository.rb
View file @
9ec32b1c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment