Skip to content

G
gitlab-ce
Commit b6117074 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen
Browse files
Options

Merge pull request #9320 from jvanbaarsen/wiki-extention 

Use .md as extention for wiki pages
parents ebe0aef2 fa2aee50
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
CHANGELOG
View file @ b6117074
...@@ -10,6 +10,7 @@ v 7.12.0 (unreleased) ...@@ -10,6 +10,7 @@ v 7.12.0 (unreleased)
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka) - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
- Fix resolving of relative links to repository files in AsciiDoc documents. (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) - 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 v 7.11.2
- no changes - no changes
......
app/models/project_wiki.rb
View file @ b6117074
...@@ -2,7 +2,7 @@ class ProjectWiki ...@@ -2,7 +2,7 @@ class ProjectWiki
include Gitlab::ShellAdapter include Gitlab::ShellAdapter
MARKUPS = { MARKUPS = {
'Markdown' => :markdown, 'Markdown' => :md,
'RDoc' => :rdoc, 'RDoc' => :rdoc,
'AsciiDoc' => :asciidoc 'AsciiDoc' => :asciidoc
} unless defined?(MARKUPS) } unless defined?(MARKUPS)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7