Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-22 17:09:15 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-22 17:09:15 +0300
commit915dda1421d8227c0ba395bfdb04ff915724c4ac (patch)
treeedd56c72784ae915bcf1765b1379200cf896f154 /app
parent94cfd4adb21f4ebbb115978e022a88cd4cf03d69 (diff)
Split Koding admin/user docs
Diffstat (limited to 'app')
-rw-r--r--app/controllers/koding_controller.rb2
-rw-r--r--app/views/admin/application_settings/_form.html.haml2
2 files changed, 2 insertions, 2 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