summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-01-15 18:11:02 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-01-15 18:11:02 +0000
commit5b19032d8873af12405a5397d5e4e1cc0af97d6a (patch)
treea58bab1c879698ff717e48972de17c420a58a6dd /doc/ci
parent4b99bee09602ea0cb950347187b5fdf6d39603b8 (diff)
downloadgitlab-ce-5b19032d8873af12405a5397d5e4e1cc0af97d6a.tar.gz
Docs: deprecates articles index
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/README.md1
-rw-r--r--doc/ci/autodeploy/index.md2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/ci/README.md b/doc/ci/README.md
index e2cf55490c7..eabeb4510db 100644
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
@@ -28,6 +28,7 @@ you don't need to set up anything to start to use them with GitLab CI/CD.
- Article (2016-08-05): [Continuous Integration, Delivery, and Deployment with GitLab - Intro to CI/CD](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/)
- Article (2015-12-14): [Getting started with GitLab and GitLab CI - Intro to CI](https://about.gitlab.com/2015/12/14/getting-started-with-gitlab-and-gitlab-ci/)
- Article (2017-07-13): [Making CI Easier with GitLab](https://about.gitlab.com/2017/07/13/making-ci-easier-with-gitlab/)
+- Article (2017-05-22): [Fast and Natural Continuous Integration with GitLab CI](https://about.gitlab.com/2017/05/22/fast-and-natural-continuous-integration-with-gitlab-ci/)
- **Videos:**
- Demo (Streamed live on Jul 17, 2017): [GitLab CI/CD Deep Dive](https://youtu.be/pBe4t1CD8Fc?t=195)
- Demo (March, 2017): [How to get started using CI/CD with GitLab](https://about.gitlab.com/2017/03/13/ci-cd-demo/)
diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md
index 474cb28b9e4..7102af5c529 100644
--- a/doc/ci/autodeploy/index.md
+++ b/doc/ci/autodeploy/index.md
@@ -37,6 +37,8 @@ during the deployment.
We made a [simple guide](quick_start_guide.md) to using Auto Deploy with GitLab.com.
+For a demonstration of GitLab Auto Deploy, read the blog post [Auto Deploy from GitLab to an OpenShift Container Cluster](https://about.gitlab.com/2017/05/16/devops-containers-gitlab-openshift/)
+
## Supported templates
The list of supported auto deploy templates is available in the