diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 06:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 06:08:47 +0300 |
| commit | 08ed6a867b690a04fe7a74c9ba697cf18f6107d7 (patch) | |
| tree | 9561a9aeee9a57cec168b143a76e6f65fd92ae0b /app/models/project_wiki.rb | |
| parent | b0f27742e78a4aa4208c271536b6b9d84c53b49e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_wiki.rb')
| -rw-r--r-- | app/models/project_wiki.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index 48c96203921..f4666197def 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -7,7 +7,8 @@ class ProjectWiki MARKUPS = { 'Markdown' => :markdown, 'RDoc' => :rdoc, - 'AsciiDoc' => :asciidoc + 'AsciiDoc' => :asciidoc, + 'Org' => :org }.freeze unless defined?(MARKUPS) CouldNotCreateWikiError = Class.new(StandardError) |