diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-17 11:41:53 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-17 11:41:53 +0200 |
| commit | 4a0fa27017e3bdf33a61d198f692419359cd6c05 (patch) | |
| tree | 6c610193350fe34de75c12d9896bd079425c199a /lib/gitlab | |
| parent | bbe0e58aebbb804cb884662be9e7f0f40db9eacd (diff) | |
| parent | 9f7c7c857b97c8124ed9af36218c3cad2c6a7fc3 (diff) | |
| download | gitlab-ce-4a0fa27017e3bdf33a61d198f692419359cd6c05.tar.gz | |
Merge branch 'master' into remove-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/markup_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb index b1991e2e285..a5f767b134d 100644 --- a/lib/gitlab/markup_helper.rb +++ b/lib/gitlab/markup_helper.rb @@ -21,7 +21,7 @@ module Gitlab # # Returns boolean def gitlab_markdown?(filename) - filename.downcase.end_with?(*%w(.mdown .md .markdown)) + filename.downcase.end_with?(*%w(.mdown .mkd .mkdn .md .markdown)) end # Public: Determines if the given filename has AsciiDoc extension. |