Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 46 deletions

diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md
index c04bcd6f549..d812aab1871 100644
--- a/doc/ci/introduction/index.md
+++ b/doc/ci/introduction/index.md
@@ -6,22 +6,18 @@ description: "An overview of Continuous Integration, Continuous Delivery, and Co
 type: concepts
 ---
 
-# Introduction to CI/CD with GitLab
+# Introduction to CI/CD concepts **(FREE)**
 
-This document presents an overview of the concepts of Continuous Integration,
-Continuous Delivery, and Continuous Deployment, as well as an introduction to
-GitLab CI/CD.
+This document introduces the concepts of Continuous Integration,
+Continuous Delivery, Continuous Deployment, and GitLab CI/CD.
 
 NOTE:
 Out-of-the-box management systems can decrease hours spent on maintaining toolchains by 10% or more.
 Watch our ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
 webcast to learn about continuous methods and how the GitLab built-in CI can help you simplify and scale software development.
 
-> For some additional information about GitLab CI/CD:
->
-> - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Watch the [CI/CD Ease of configuration](https://www.youtube.com/embed/opdLqwz6tcE) video.
-> - Watch the [Making the case for CI/CD in your organization](https://about.gitlab.com/compare/github-actions-alternative/)
->   webcast to learn the benefits of CI/CD and how to measure the results of CI/CD automation.
+> - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Learn how to [configure CI/CD](https://www.youtube.com/embed/opdLqwz6tcE).
+> - [Make the case for CI/CD in your organization](https://about.gitlab.com/compare/github-actions-alternative/).
 > - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Learn how [Verizon reduced rebuilds](https://about.gitlab.com/blog/2019/02/14/verizon-customer-story/)
 >   from 30 days to under 8 hours with GitLab.
 
@@ -82,7 +78,7 @@ deployed.
 
 ## Introduction to GitLab CI/CD
 
-GitLab CI/CD is a powerful tool built into GitLab that allows you
+[GitLab CI/CD](../quick_start/index.md) is a powerful tool built into GitLab that allows you
 to apply all the continuous methods (Continuous Integration,
 Delivery, and Deployment) to your software with no third-party
 application or integration needed.
@@ -121,7 +117,7 @@ without the need for an external tool to deliver your software.
 And, most usefully, you can visualize all the steps through
 the GitLab UI.
 
-#### A deeper look into the CI/CD basic workflow
+### A deeper look into the CI/CD workflow
 
 If we take a deeper look into the basic workflow, we can see
 the features available in GitLab at each stage of the DevOps
@@ -129,39 +125,5 @@ lifecycle, as shown in the illustration below.
 
 ![Deeper look into the basic CI/CD workflow](img/gitlab_workflow_example_extended_v12_3.png)
 
-If you look at the image from the left to the right,
-you can see some of the features available in GitLab
-according to each stage (Verify, Package, Release).
-
-1. **Verify**:
-   - Automatically build and test your application with Continuous Integration.
-   - Analyze your source code quality with [GitLab Code Quality](../../user/project/merge_requests/code_quality.md).
-   - Determine the browser performance impact of code changes with [Browser Performance Testing](../../user/project/merge_requests/browser_performance_testing.md). **(PREMIUM)**
-   - Determine the server performance impact of code changes with [Load Performance Testing](../../user/project/merge_requests/load_performance_testing.md). **(PREMIUM)**
-   - Perform a series of tests, such as [Container Scanning](../../user/application_security/container_scanning/index.md) **(ULTIMATE)**, [Dependency Scanning](../../user/application_security/dependency_scanning/index.md) **(ULTIMATE)**, and [Unit tests](../unit_test_reports.md).
-   - Deploy your changes with [Review Apps](../review_apps/index.md) to preview the app changes on every branch.
-1. **Package**:
-   - Store Docker images with the [Container Registry](../../user/packages/container_registry/index.md).
-   - Store packages with the [Package Registry](../../user/packages/package_registry/index.md).
-1. **Release**:
-   - Continuous Deployment, automatically deploying your app to production.
-   - Continuous Delivery, manually click to deploy your app to production.
-   - Deploy static websites with [GitLab Pages](../../user/project/pages/index.md).
-   - Ship features to only a portion of your pods and let a percentage of your user base to visit the temporarily deployed feature with [Canary Deployments](../../user/project/canary_deployments.md).
-   - Deploy your features behind [Feature Flags](../../operations/feature_flags.md).
-   - Add release notes to any Git tag with [GitLab Releases](../../user/project/releases/index.md).
-   - View of the current health and status of each CI environment running on Kubernetes with [Deploy Boards](../../user/project/deploy_boards.md).
-   - Deploy your application to a production environment in a Kubernetes cluster with [Auto Deploy](../../topics/autodevops/stages.md#auto-deploy).
-
-With GitLab CI/CD you can also:
-
-- Easily set up your app's entire lifecycle with [Auto DevOps](../../topics/autodevops/index.md).
-- Deploy your app to different [environments](../environments/index.md).
-- Install your own [GitLab Runner](https://docs.gitlab.com/runner/).
-- [Schedule pipelines](../pipelines/schedules.md).
-- Check for app vulnerabilities with [Security Test reports](../../user/application_security/index.md). **(ULTIMATE)**
-
-To see all CI/CD features, navigate back to the [CI/CD index](../README.md).
-
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-Watch the video [GitLab CI Live Demo](https://youtu.be/l5705U8s_nQ?t=369) with a deeper overview of GitLab CI/CD.
+[Get a deeper look at GitLab CI/CD](https://youtu.be/l5705U8s_nQ?t=369).