diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-26 19:00:43 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-26 19:00:43 +0200 |
| commit | b6117074ccb018a679d72f3faf4302ddb076a3ac (patch) | |
| tree | 98817ee1b887dc5b1e30ff2030bf2e7a218916c7 | |
| parent | ebe0aef26901aee211e78b861925bbab97027aa6 (diff) | |
| parent | fa2aee5048d4f6acd393fdddf119bca74a4b94d7 (diff) | |
| download | gitlab-ce-b6117074ccb018a679d72f3faf4302ddb076a3ac.tar.gz | |
Merge pull request #9320 from jvanbaarsen/wiki-extention
Use .md as extention for wiki pages
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/project_wiki.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a168342fceb..ca8d1ec2ef1 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 0706a1ca0d1..231973fa543 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) |