diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
| commit | 496c750e3f387624fd51a37954efe87ef6b465bd (patch) | |
| tree | b94bd0e1b1e0e7ae179cd2cdb91aa194d7276eb2 /config | |
| parent | 90b06afdeaa13fe14218a53c8afbc4802af53a27 (diff) | |
| parent | dfd6c3f824ada5558546b809fd32468325788b94 (diff) | |
| download | gitlab-ce-ph-multi-file-upload-file.tar.gz | |
Merge branch 'master' into ph-multi-file-upload-fileph-multi-file-upload-file
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/help.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/routes/help.rb b/config/routes/help.rb index d53822da9ec..2ea8bfd7aed 100644 --- a/config/routes/help.rb +++ b/config/routes/help.rb @@ -1,4 +1,5 @@ -get 'help' => 'help#index' -get 'help/shortcuts' => 'help#shortcuts' -get 'help/ui' => 'help#ui' -get 'help/*path' => 'help#show', as: :help_page +get 'help' => 'help#index' +get 'help/shortcuts' => 'help#shortcuts' +get 'help/ui' => 'help#ui' +get 'help/instance_configuration' => 'help#instance_configuration' +get 'help/*path' => 'help#show', as: :help_page |