diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-01-15 15:58:47 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-01-15 15:58:47 +0000 |
| commit | 6b36fff5f5b4ccfce8465a0981062297f3dd1ab6 (patch) | |
| tree | c3f33d4a4b8cc361aee003ec39f73a6d0253efa1 | |
| parent | b7ce0ac24162d9fa14749b0adf1020668ad45c22 (diff) | |
| parent | 032fbe6c6393283ca02a0b3e1046a4cfd32fea74 (diff) | |
| download | gitlab-ce-6b36fff5f5b4ccfce8465a0981062297f3dd1ab6.tar.gz | |
Merge branch 'docs-fix-duplicate-sections' into 'master'
Docs: fix duplicate sections (CI docs) - Backport to CE
See merge request gitlab-org/gitlab-ce!16463
| -rw-r--r-- | doc/ci/README.md | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/doc/ci/README.md b/doc/ci/README.md index 3a10365af77..e2cf55490c7 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -93,17 +93,6 @@ Leverage the power of Docker to run your CI pipelines. See the documentation on [GitLab Pages](../user/project/pages/index.md). -## Special configuration (GitLab admin) - -As a GitLab administrator, you can change the default behavior of GitLab CI/CD in -your whole GitLab instance as well as in each project. - -- **Project specific:** - - [Pipelines settings](../user/project/pipelines/settings.md) - - [Learn how to enable or disable GitLab CI](enable_or_disable_ci.md) -- **Affecting the whole GitLab instance:** - - [Continuous Integration admin settings](../user/admin_area/settings/continuous_integration.md) - ## Examples Check the [GitLab CI/CD examples](examples/README.md) for a collection of tutorials and guides on setting up your CI/CD pipeline for various programming languages, frameworks, @@ -115,6 +104,18 @@ and operating systems. - Article (2016-05-05): [Getting Started with GitLab and Shippable Continuous Integration](https://about.gitlab.com/2016/05/05/getting-started-gitlab-and-shippable/) - Article (2016-04-19): [GitLab Partners with DigitalOcean to make Continuous Integration faster, safer, and more affordable](https://about.gitlab.com/2016/04/19/gitlab-partners-with-digitalocean-to-make-continuous-integration-faster-safer-and-more-affordable/) +## Special configuration (GitLab admin) + +As a GitLab administrator, you can change the default behavior of GitLab CI/CD in +your whole GitLab instance as well as in each project. + +- [Continuous Integration admin settings](../administration/index.md#continuous-integration-settings) +- **Project specific:** + - [Pipelines settings](../user/project/pipelines/settings.md) + - [Learn how to enable or disable GitLab CI](enable_or_disable_ci.md) +- **Affecting the whole GitLab instance:** + - [Continuous Integration admin settings](../user/admin_area/settings/continuous_integration.md) + ## Breaking changes - [CI variables renaming for GitLab 9.0](variables/README.md#9-0-renaming) Read about the |