diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-25 17:01:05 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-25 17:01:05 +0000 |
| commit | b099a10e8595a517a401c9e9d2a3962f96578081 (patch) | |
| tree | e2f3d76a574a4bf815ab7ea198ef20dcf7752485 | |
| parent | 871514f498e6ce8245c3f3ba647dc84be8a7fdfe (diff) | |
| parent | 9a6b7da91adce3cf8021a872e870ad828998cfb1 (diff) | |
| download | gitlab-ce-b099a10e8595a517a401c9e9d2a3962f96578081.tar.gz | |
Merge branch 'doc/fix-koding-integration-link' into 'master'
Fix wrong Koding link
See merge request !6030
| -rw-r--r-- | doc/README.md | 1 | ||||
| -rw-r--r-- | doc/integration/README.md | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md index 047035dfb09..254394eb63e 100644 --- a/doc/README.md +++ b/doc/README.md @@ -19,7 +19,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]. |