summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pundsack <mpundsack@gitlab.com>2017-09-07 12:38:07 -0500
committerMark Pundsack <mpundsack@gitlab.com>2017-09-07 12:46:21 -0500
commit45b65ac8653e3a99276ead028852329ee88005f7 (patch)
tree04637cc09367a569197f9ed71379795e7786b2c8
parentba96ee8c9324244f3d05e9f834daeb53a8cf07e5 (diff)
downloadgitlab-ce-45b65ac8653e3a99276ead028852329ee88005f7.tar.gz
Deprecate Auto Deploy templates
-rw-r--r--doc/ci/autodeploy/index.md20
-rw-r--r--doc/topics/autodevops/index.md4
2 files changed, 13 insertions, 11 deletions
diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md
index a128cf69c20..ebf4ecd008c 100644
--- a/doc/ci/autodeploy/index.md
+++ b/doc/ci/autodeploy/index.md
@@ -1,13 +1,16 @@
# Auto Deploy
->**Notes:**
-- [Introduced][mr-8135] in GitLab 8.15.
-- Auto deploy is an experimental feature and is not recommended for Production
- use at this time.
-- As of GitLab 9.1, access to the Container Registry is only available while
- the Pipeline is running. Restarting a pod, scaling a service, or other actions
- which require on-going access will fail. On-going secure access is planned for
- a subsequent release.
+> [Introduced][mr-8135] in GitLab 8.15.
+> Auto deploy is an experimental feature and is **not recommended for Production use** at this time.
+
+> As of GitLab 9.1, access to the container registry is only available while the
+Pipeline is running. Restarting a pod, scaling a service, or other actions which
+require on-going access **will fail**. On-going secure access is planned for a
+subsequent release.
+
+> As of GitLab 10.0, Auto Deploy templates are **deprecated** and the
+functionality has been included in [Auto
+DevOps](../topics/auto-devops/index.md).
Auto deploy is an easy way to configure GitLab CI for the deployment of your
application. GitLab Community maintains a list of `.gitlab-ci.yml`
@@ -122,4 +125,3 @@ If you have installed GitLab using a different method:
[kube-deploy]: https://gitlab.com/gitlab-examples/kubernetes-deploy "Kubernetes deploy example project"
[container-registry]: https://docs.gitlab.com/ce/user/project/container_registry.html
[postgresql]: https://www.postgresql.org/
-
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index ac4f5b1a153..fcb9cb90b3a 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -3,8 +3,8 @@
> [Introduced][ce-37115] in GitLab 10.0. Auto DevOps is currently in Beta and
**not recommended for production use**. Access to the container registry is only
available while the Pipeline is running. Restarting a pod, scaling a service, or
-other actions which require on-going access will fail. On-going secure access is
-planned for a subsequent release.
+other actions which require on-going access **will fail**. On-going secure
+access is planned for a subsequent release.
Auto DevOps brings best practices to your project in an easy and default way. A
typical web project starts with Continuous Integration (CI), then adds automated