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
Boxiang Sun
gitlab-ce
Commits
c5d97c7e
Commit
c5d97c7e
authored
Sep 19, 2015
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COPYING is now also accepted as licence file
Fixes #2526
parent
a2f0a365
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
CHANGELOG
CHANGELOG
+2
-0
app/models/repository.rb
app/models/repository.rb
+3
-3
No files found.
CHANGELOG
View file @
c5d97c7e
...
...
@@ -90,6 +90,8 @@ v 8.0.1
v 8.0.0
- Fix Markdown links not showing up in dashboard activity feed (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 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)
...
...
app/models/repository.rb
View file @
c5d97c7e
...
...
@@ -210,9 +210,9 @@ class Repository
def
license
cache
.
fetch
(
:license
)
do
tree
(
:head
).
blobs
.
find
do
|
file
|
file
.
name
=~
/\A
license
/i
end
tree
(
:head
).
blobs
.
find
_all
do
|
file
|
file
.
name
=~
/\A
(copying|license)
/i
end
.
last
# Prefer `LICENSE` as filename over `COPYING`
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