summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 06:06:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 06:06:26 +0000
commit42b933efc3384386c1991daca1a6d58160f70176 (patch)
tree31c59c87b26efd7a51b7230ddab894131dc2e0f7 /doc/ci
parent3d67f14ecb37274f1c269c0d50b61615788c7f16 (diff)
downloadgitlab-ce-42b933efc3384386c1991daca1a6d58160f70176.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/introduction/img/gitlab_workflow_example_extended_11_11.pngbin136497 -> 0 bytes
-rw-r--r--doc/ci/introduction/img/gitlab_workflow_example_extended_v12_3.pngbin0 -> 78448 bytes
-rw-r--r--doc/ci/introduction/index.md2
3 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/introduction/img/gitlab_workflow_example_extended_11_11.png b/doc/ci/introduction/img/gitlab_workflow_example_extended_11_11.png
deleted file mode 100644
index a0874f66eaa..00000000000
--- a/doc/ci/introduction/img/gitlab_workflow_example_extended_11_11.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/introduction/img/gitlab_workflow_example_extended_v12_3.png b/doc/ci/introduction/img/gitlab_workflow_example_extended_v12_3.png
new file mode 100644
index 00000000000..6e1066d4868
--- /dev/null
+++ b/doc/ci/introduction/img/gitlab_workflow_example_extended_v12_3.png
Binary files differ
diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md
index 366aca3442e..d5ba94f4d19 100644
--- a/doc/ci/introduction/index.md
+++ b/doc/ci/introduction/index.md
@@ -174,7 +174,7 @@ If we take a deeper look into the basic workflow, we can see
the features available in GitLab at each stage of the DevOps
lifecycle, as shown on the illustration below.
-![Deeper look into the basic CI/CD workflow](img/gitlab_workflow_example_extended_11_11.png)
+![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'll see some of the features available in GitLab