summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-07 11:20:35 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-07 11:20:35 +0200
commit0fd06adf0c5e373f2c03574f9f92069491985492 (patch)
tree41fd888fd4048868fd58afc9a1eaad4ab463b360 /lib
parent90cb56f033794812b0680e316e2075fe03b45ad0 (diff)
parent7bcd6f79a4b21a2b87075c447e5f836666f1d31d (diff)
downloadgitlab-ce-0fd06adf0c5e373f2c03574f9f92069491985492.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markdown_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/markdown_helper.rb b/lib/gitlab/markdown_helper.rb
index abed12fe570..5e3cfc0585b 100644
--- a/lib/gitlab/markdown_helper.rb
+++ b/lib/gitlab/markdown_helper.rb
@@ -21,5 +21,9 @@ module Gitlab
def gitlab_markdown?(filename)
filename.downcase.end_with?(*%w(.mdown .md .markdown))
end
+
+ def previewable?(filename)
+ gitlab_markdown?(filename) || markup?(filename)
+ end
end
end