summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSullivan SENECHAL <soullivaneuh@gmail.com>2014-10-07 14:06:05 +0200
committerSullivan SENECHAL <sullivan@nexylan.com>2015-04-03 11:56:50 +0200
commitd365004e684e98459061fcd5fbaf9bea880934a8 (patch)
tree0a2961445ed5b23e97ed2c7f676bf6bf76a09e78 /config
parent0d0042d27481d31027a10edb2ba3a184bff5075a (diff)
downloadgitlab-ce-d365004e684e98459061fcd5fbaf9bea880934a8.tar.gz
Fix and improve help rendering
Diffstat (limited to 'config')
-rw-r--r--config/initializers/mime_types.rb1
-rw-r--r--config/routes.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 8f8bef42bef..6978ad93024 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -6,3 +6,4 @@
Mime::Type.register_alias "text/plain", :diff
Mime::Type.register_alias "text/plain", :patch
+Mime::Type.register_alias 'text/html', :md
diff --git a/config/routes.rb b/config/routes.rb
index 388858d2670..c1b85b025b5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -39,9 +39,9 @@ Gitlab::Application.routes.draw do
# Help
get 'help' => 'help#index'
- get 'help/:category/:file' => 'help#show', as: :help_page
get 'help/shortcuts'
get 'help/ui' => 'help#ui'
+ get 'help/:filepath' => 'help#show', as: :help_page, constraints: { filepath: /[^\.]+/ }
#
# Global snippets