Merge pull request #9320 from jvanbaarsen/wiki-extention

Use .md as extention for wiki pages

Merge pull request #9320 from jvanbaarsen/wiki-extention
Use .md as extention for wiki pages
b6117074 · Jeroen van Baarsen · ebe0aef2 · fa2aee50 · b6117074 · b6117074
Commit b6117074 authored May 26, 2015 by Jeroen van Baarsen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

app/models/project_wiki.rb app/models/project_wiki.rb +1 -1

No files found.
--- 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

--- 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)