diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-21 16:41:11 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-21 16:41:11 +0300 |
| commit | 0625b15a481b3a3edd88110b3c18031ad9068d2f (patch) | |
| tree | c382ff09cfb221b492fa14372827bea358f293ae /config | |
| parent | 81112b54051c99c7546b282c47edc176f0aebd40 (diff) | |
| parent | abdc4cbef23a14540cc4526d0e5af23852ce1119 (diff) | |
Merge branch '7-10-rc5' into '7-10-stable'
7.10.0.rc5
cc @job
See merge request !1787
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/mime_types.rb | 3 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 6978ad93024..ca58ae92d1b 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -6,4 +6,5 @@ Mime::Type.register_alias "text/plain", :diff Mime::Type.register_alias "text/plain", :patch -Mime::Type.register_alias 'text/html', :md +Mime::Type.register_alias 'text/html', :markdown +Mime::Type.register_alias 'text/html', :md diff --git a/config/routes.rb b/config/routes.rb index 4f33b11d220..744a99feded 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, constraints: { category: /.*/, file: /[^\/\.]+/ } get 'help/shortcuts' get 'help/ui' => 'help#ui' - get 'help/:filepath' => 'help#show', as: :help_page, constraints: { filepath: /[^\.]+/ } # # Global snippets |