diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-22 15:41:26 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-22 15:41:26 +0000 |
| commit | 5c7bca339bdb3c1b32ccea9d39d0789a949bca19 (patch) | |
| tree | bec72402dc8b69dd3b093ef1fb91e331ae8f2530 /app | |
| parent | a41cd65e7971d3da452e87d5fc074afcf4676c86 (diff) | |
| parent | 49c8530ea7c6d2d23ceca3cba78d62bc45b2c6ef (diff) | |
| download | gitlab-ce-5c7bca339bdb3c1b32ccea9d39d0789a949bca19.tar.gz | |
Merge branch 'docs-koding-change-loc' into 'master'
Split Koding admin/user docs
Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909
See merge request !5938
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/koding_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/koding/index.html.haml | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/koding_controller.rb b/app/controllers/koding_controller.rb index bb89f3090f9..f3759b4c0ea 100644 --- a/app/controllers/koding_controller.rb +++ b/app/controllers/koding_controller.rb @@ -3,7 +3,7 @@ class KodingController < ApplicationController layout 'koding' def index - path = File.join(Rails.root, 'doc/integration/koding-usage.md') + path = File.join(Rails.root, 'doc/user/project/koding.md') @markdown = File.read(path) end diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index e0878512e62..d929364fc96 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -405,7 +405,7 @@ %strong gitlab team, and you need to provide that team's URL here. Learn more in the = succeed "." do - = link_to "Koding integration documentation", help_page_path("integration/koding") + = link_to "Koding administration documentation", help_page_path("administration/integration/koding") .form-actions diff --git a/app/views/koding/index.html.haml b/app/views/koding/index.html.haml index 111cc67336c..65887aacbaf 100644 --- a/app/views/koding/index.html.haml +++ b/app/views/koding/index.html.haml @@ -4,6 +4,3 @@ Integration is active for = link_to koding_project_url, target: '_blank' do #{current_application_settings.koding_url} - -.documentation.wiki - = markdown @markdown |