diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-06 11:02:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-06 11:02:13 +0000 |
| commit | b4ecbef24d87631129e75925a2b23d88400e53a2 (patch) | |
| tree | f82e47af4a512a809b87bc9d2f1d0f8ce8c77c3f /lib | |
| parent | fec402ae9100a9ba11611dc45830c84c45c3f862 (diff) | |
| parent | 0846e8a6f59c6a3a04adb935eba70f0187c48c7e (diff) | |
| download | gitlab-ce-b4ecbef24d87631129e75925a2b23d88400e53a2.tar.gz | |
Merge branch '18933-render-index-like-readme' into 'master'
Render index.* like README.* when it's present in a directory
Closes #18933
See merge request gitlab-org/gitlab-ce!22639
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/file_detector.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/markup_helper.rb | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/gitlab/file_detector.rb b/lib/gitlab/file_detector.rb index 4d89ee5a669..d6338b09e3d 100644 --- a/lib/gitlab/file_detector.rb +++ b/lib/gitlab/file_detector.rb @@ -8,7 +8,7 @@ module Gitlab module FileDetector PATTERNS = { # Project files - readme: %r{\Areadme[^/]*\z}i, + readme: %r{\A(readme|index)[^/]*\z}i, changelog: %r{\A(changelog|history|changes|news)[^/]*\z}i, license: %r{\A((un)?licen[sc]e|copying)(\.[^/]+)?\z}i, contributing: %r{\Acontributing[^/]*\z}i, diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb index 142b7d1a472..d419fa66e57 100644 --- a/lib/gitlab/markup_helper.rb +++ b/lib/gitlab/markup_helper.rb @@ -4,10 +4,11 @@ module Gitlab module MarkupHelper extend self - MARKDOWN_EXTENSIONS = %w(mdown mkd mkdn md markdown).freeze - ASCIIDOC_EXTENSIONS = %w(adoc ad asciidoc).freeze - OTHER_EXTENSIONS = %w(textile rdoc org creole wiki mediawiki rst).freeze + MARKDOWN_EXTENSIONS = %w[mdown mkd mkdn md markdown].freeze + ASCIIDOC_EXTENSIONS = %w[adoc ad asciidoc].freeze + OTHER_EXTENSIONS = %w[textile rdoc org creole wiki mediawiki rst].freeze EXTENSIONS = MARKDOWN_EXTENSIONS + ASCIIDOC_EXTENSIONS + OTHER_EXTENSIONS + PLAIN_FILENAMES = %w[readme index].freeze # Public: Determines if a given filename is compatible with GitHub::Markup. # @@ -43,7 +44,7 @@ module Gitlab # # Returns boolean def plain?(filename) - extension(filename) == 'txt' || filename.casecmp('readme').zero? + extension(filename) == 'txt' || plain_filename?(filename) end def previewable?(filename) @@ -55,5 +56,9 @@ module Gitlab def extension(filename) File.extname(filename).downcase.delete('.') end + + def plain_filename?(filename) + PLAIN_FILENAMES.include?(filename.downcase) + end end end |