summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-15 12:24:44 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-15 12:24:44 -0400
commitef47ea3d39d9235c2842d1f374d0f03e56da7eeb (patch)
treeb8d38727275e556bc79a76e899b40406e707d621 /config
parent5f78601c8a67028f246134d325cca99952ba78b6 (diff)
downloadgitlab-ce-ef47ea3d39d9235c2842d1f374d0f03e56da7eeb.tar.gz
Revert "Fix and improve help rendering"
This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/mime_types.rb1
-rw-r--r--config/routes.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 6978ad93024..8f8bef42bef 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -6,4 +6,3 @@
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 4f33b11d220..af58e095d9a 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