diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-17 18:30:35 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-17 18:30:35 -0500 |
| commit | c86e2be19045dda9d2bd8eeed99bfe32f39a2d5a (patch) | |
| tree | 283fe4f5654a37619fe9a4b1a0d087fed88a6d21 | |
| parent | 2425eca53db4f4c0ae940fc3c361b41f3a38e529 (diff) | |
| download | gitlab-ce-c86e2be19045dda9d2bd8eeed99bfe32f39a2d5a.tar.gz | |
Don't check inclusion inside helper
| -rw-r--r-- | lib/gitlab/markup_helper.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb index a7b73432efc..22bd58290f8 100644 --- a/lib/gitlab/markup_helper.rb +++ b/lib/gitlab/markup_helper.rb @@ -13,7 +13,7 @@ module Gitlab # # Returns boolean def markup?(filename) - extension?(filename, EXTENSIONS) + EXTENSIONS.include?(extension(filename)) end # Public: Determines if a given filename is compatible with @@ -23,7 +23,7 @@ module Gitlab # # Returns boolean def gitlab_markdown?(filename) - extension?(filename, MARKDOWN_EXTENSIONS) + MARKDOWN_EXTENSIONS.include?(extension(filename)) end # Public: Determines if the given filename has AsciiDoc extension. @@ -32,7 +32,7 @@ module Gitlab # # Returns boolean def asciidoc?(filename) - extension?(filename, ASCIIDOC_EXTENSIONS) + ASCIIDOC_EXTENSIONS.include?(extension(filename)) end # Public: Determines if the given filename is plain text. @@ -41,8 +41,7 @@ module Gitlab # # Returns boolean def plain?(filename) - extension?(filename, %w(txt)) || - filename.downcase == 'readme' + extension(filename) == 'txt' || filename.downcase == 'readme' end def previewable?(filename) @@ -51,8 +50,8 @@ module Gitlab private - def extension?(filename, extensions) - extensions.include?(File.extname(filename).downcase.delete('.')) + def extension(filename) + File.extname(filename).downcase.delete('.') end end end |
