home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'validate-readme-format' into 'master'

Browse Source 
Validate README format

Take the first previewable README file as project's README, otherwise if
none file is available, or we can't preview any of them, we assume that
project doesn't have a README file.

Fixes #3978
This commit is contained in:
Robert Speicher
2016-01-05 17:03:24 -05:00
parent 67a927ff8b 8e33ec1dee
commit d453b24aca
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/tree.rb
+7 -9
View File
@@ -17,17 +17,15 @@ class Tree
def readme
return @readme if defined?(@readme)
available_readmes = blobs.select(&:readme?)
if available_readmes.count == 0
return @readme = nil
# Take the first previewable readme, or return nil if none is available or
# we can't preview any of them
readme_tree = blobs.find do |blob|
blob.readme? && (previewable?(blob.name) || plain?(blob.name))
end
# Take the first previewable readme, or the first available readme, if we
# can't preview any of them
readme_tree = available_readmes.find do |readme|
previewable?(readme.name)
end || available_readmes.first
if readme_tree.nil?
return @readme = nil
end
readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name)