diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-04 14:23:32 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-04 14:23:32 +0200 |
| commit | 45ca39e81bf857cdb58b1a184b8fab0e56c200f7 (patch) | |
| tree | f6df41eab9f5f66ee4ff86196634bb331d9aff84 /config | |
| parent | 124e7d5efc53cfacf6fb579328245e0619c73c9d (diff) | |
| parent | 9925051ece7bd8758cda9179340b734f6f5c522f (diff) | |
| download | gitlab-ce-45ca39e81bf857cdb58b1a184b8fab0e56c200f7.tar.gz | |
Merge remote-tracking branch 'github.com/master'
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/mime_types.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
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 |