diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-08-24 11:57:54 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-08-24 11:57:54 +0200 |
| commit | 8b1fe5f4ff1ca0ef975331a8508b51ba4df8e6c9 (patch) | |
| tree | b0c4ffd679e237fa9d92179b92800aa47f1bc706 | |
| parent | a820a15dc0eda71831584db901691081160001e3 (diff) | |
| parent | 4a14b5900ba752b9f481d00260890868f62dd599 (diff) | |
| download | gitlab-ce-8b1fe5f4ff1ca0ef975331a8508b51ba4df8e6c9.tar.gz | |
Merge pull request #7569 from offlinehoster/patch-2
Added AsciiDoc support and changed to singlequotes
| -rw-r--r-- | app/models/project_wiki.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index a8ba5efcc7c..a82a300a672 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -2,8 +2,9 @@ class ProjectWiki include Gitlab::ShellAdapter MARKUPS = { - "Markdown" => :markdown, - "RDoc" => :rdoc + 'Markdown' => :markdown, + 'RDoc' => :rdoc, + 'AsciiDoc' => :asciidoc } class CouldNotCreateWikiError < StandardError; end |