From 4ee1f224c2152f0b58eb5a535ddc5fb8e90709ed Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Thu, 25 Aug 2016 17:01:05 +0000 Subject: Merge branch 'doc/fix-koding-integration-link' into 'master' Fix wrong Koding link See merge request !6030 --- doc/README.md | 1 - doc/integration/README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/README.md b/doc/README.md index 195b7c7af62..452cf1c50c2 100644 --- a/doc/README.md +++ b/doc/README.md @@ -18,7 +18,6 @@ - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. - [Webhooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project. - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN. -- [Koding](user/project/koding.md) Learn how to use Koding, the online IDE. ## Administrator documentation diff --git a/doc/integration/README.md b/doc/integration/README.md index 70895abbcad..c2fd299db07 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -15,7 +15,7 @@ See the documentation below for details on how to configure these services. - [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages - [reCAPTCHA](recaptcha.md) Configure GitLab to use Google reCAPTCHA for new users - [Akismet](akismet.md) Configure Akismet to stop spam -- [Koding](koding.md) Configure Koding to use IDE integration +- [Koding](../administration/integration/koding.md) Configure Koding to use IDE integration GitLab Enterprise Edition contains [advanced Jenkins support][jenkins]. -- cgit v1.2.1