Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 6 deletions

diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 33b13935de3..db622beb253 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -19,12 +19,20 @@ For an introduction to Auto DevOps, watch [AutoDevOps in GitLab 11.0](https://yo
 
 ## Enabled by default
 
-Starting with GitLab 11.3, the Auto DevOps pipeline is enabled by default for all
-projects. If it has not been explicitly enabled for the project, Auto DevOps will be automatically
-disabled on the first pipeline failure. Your project will continue to use an alternative
-[CI/CD configuration file](../../ci/yaml/README.md) if one is found. A GitLab
-administrator can [change this setting](../../user/admin_area/settings/continuous_integration.md#auto-devops-core-only)
-in the admin area.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/41729) in GitLab 11.3.
+
+Auto DevOps is enabled by default for all projects and will attempt to run on all pipelines
+in each project. This default can be enabled or disabled by an instance administrator in the
+[Auto DevOps settings](../../user/admin_area/settings/continuous_integration.md#auto-devops-core-only).
+It will be automatically disabled in individual projects on their first pipeline failure,
+if it has not been explicitly enabled for the project.
+
+Since [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/issues/26655), Auto DevOps
+will run on pipelines automatically only if a [`Dockerfile` or matching buildpack](#auto-build)
+exists.
+
+If a [CI/CD configuration file](../../ci/yaml/README.md) is present in the project,
+it will continue to be used, whether or not Auto DevOps is enabled.
 
 ## Quick start