Commit e956d116 authored by Stan Hu's avatar Stan Hu

Merge branch 'more-markdown-extensions' into 'master'

markup_helper: detect .mkd and .mkdn as markdown

See merge request !1148
parents 6a82c9f0 013260e0
...@@ -53,6 +53,7 @@ v 7.14.0 (unreleased) ...@@ -53,6 +53,7 @@ v 7.14.0 (unreleased)
- Include branch/tag name in archive file and directory name - Include branch/tag name in archive file and directory name
- Add dropzone upload progress - Add dropzone upload progress
- Add a label for merged branches on branches page (Florent Baldino) - Add a label for merged branches on branches page (Florent Baldino)
- Detect .mkd and .mkdn files as markdown (Ben Boeckel)
v 7.13.3 v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
......
...@@ -21,7 +21,7 @@ module Gitlab ...@@ -21,7 +21,7 @@ module Gitlab
# #
# Returns boolean # Returns boolean
def gitlab_markdown?(filename) def gitlab_markdown?(filename)
filename.downcase.end_with?(*%w(.mdown .md .markdown)) filename.downcase.end_with?(*%w(.mdown .mkd .mkdn .md .markdown))
end end
# Public: Determines if the given filename has AsciiDoc extension. # Public: Determines if the given filename has AsciiDoc extension.
......
...@@ -15,7 +15,7 @@ describe Gitlab::MarkupHelper do ...@@ -15,7 +15,7 @@ describe Gitlab::MarkupHelper do
end end
describe '#gitlab_markdown?' do describe '#gitlab_markdown?' do
%w(mdown md markdown).each do |type| %w(mdown mkd mkdn md markdown).each do |type|
it "returns true for #{type} files" do it "returns true for #{type} files" do
expect(Gitlab::MarkupHelper.gitlab_markdown?("README.#{type}")).to be_truthy expect(Gitlab::MarkupHelper.gitlab_markdown?("README.#{type}")).to be_truthy
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment