diff --git a/CHANGELOG b/CHANGELOG index a168342fceb1a776b67d47f9ceff7921622337c8..ca8d1ec2ef16840f21a5b471bdbb88ccbb21dfc6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 7.12.0 (unreleased) - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka) - Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka) - Use the user list from the target project in a merge request (Stan Hu) + - Default extention for wiki pages is now .md instead of .markdown (Jeroen van Baarsen) v 7.11.2 - no changes diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index 0706a1ca0d12d485de81e6052e3f7e71fa38b7c5..231973fa543353507d42e8d11df59945da4886d4 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -2,7 +2,7 @@ class ProjectWiki include Gitlab::ShellAdapter MARKUPS = { - 'Markdown' => :markdown, + 'Markdown' => :md, 'RDoc' => :rdoc, 'AsciiDoc' => :asciidoc } unless defined?(MARKUPS)