summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-09 09:54:31 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-09 09:54:31 +0000
commit11e43cddbc22e9402e1f3f0f79172cebd741983f (patch)
tree73d781b23380cac46a1d7e643e5b1e235b769474 /lib
parent3cdd68475f80c43371610c981b41cd3dc87e3300 (diff)
parent1bf3e1578abf41d937a2bf8e2512e0174ed0a4b4 (diff)
downloadgitlab-ce-11e43cddbc22e9402e1f3f0f79172cebd741983f.tar.gz
Merge branch 'plain-readme' into 'master'
Properly render plain readme ## Before ![Screenshot_2015-07-09_11.38.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba53ad380060eba368aed4ecc71ff4da/Screenshot_2015-07-09_11.38.16.png) ## After ![Screenshot_2015-07-09_11.37.38](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b154c5464c3f89d3ed7a0e7157ee6c58/Screenshot_2015-07-09_11.37.38.png) cc @rspeicher Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !945
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markup_helper.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb
index f99be969d3e..b1991e2e285 100644
--- a/lib/gitlab/markup_helper.rb
+++ b/lib/gitlab/markup_helper.rb
@@ -33,6 +33,16 @@ module Gitlab
filename.downcase.end_with?(*%w(.adoc .ad .asciidoc))
end
+ # Public: Determines if the given filename is plain text.
+ #
+ # filename - Filename string to check
+ #
+ # Returns boolean
+ def plain?(filename)
+ filename.downcase.end_with?('.txt') ||
+ filename.downcase == 'readme'
+ end
+
def previewable?(filename)
markup?(filename)
end