Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
6a4fbfb96020
Commit
6a4fbfb9
authored
May 26, 2015
by
Jeroen van Baarsen
Browse files
Merge pull request #9320 from jvanbaarsen/wiki-extention
Use .md as extention for wiki pages
parents
4d9f2146a0dc
33d4bab00577
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
6a4fbfb9
...
...
@@ -10,6 +10,7 @@
- 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
...
...
app/models/project_wiki.rb
View file @
6a4fbfb9
...
...
@@ -2,7 +2,7 @@
include
Gitlab
::
ShellAdapter
MARKUPS
=
{
'Markdown'
=>
:m
arkdown
,
'Markdown'
=>
:m
d
,
'RDoc'
=>
:rdoc
,
'AsciiDoc'
=>
:asciidoc
}
unless
defined?
(
MARKUPS
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment