diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 12:21:47 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 12:21:47 +0000 |
| commit | 22caa23bb1b9e46a568aeab66ed52fde6cc85d3d (patch) | |
| tree | 9558eafd6eb3734c1e85feabcd61ad14d1d5334a | |
| parent | fd20e79059e297060476090854c7afb36209f156 (diff) | |
| parent | 236feb08bc6b40aa67d498727c86c4178815424b (diff) | |
| download | gitlab-ce-22caa23bb1b9e46a568aeab66ed52fde6cc85d3d.tar.gz | |
Merge branch 'docs/gb/update-pipeline-badge-docs' into 'master'
Update pipeline status badge details docs
Closes #40316
See merge request gitlab-org/gitlab-ce!15483
| -rw-r--r-- | doc/ci/yaml/README.md | 2 | ||||
| -rw-r--r-- | doc/user/project/pipelines/settings.md | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 6ad70707594..f40d2c5e347 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -124,7 +124,7 @@ stages: 1. First, all jobs of `build` are executed in parallel. 1. If all jobs of `build` succeed, the `test` jobs are executed in parallel. 1. If all jobs of `test` succeed, the `deploy` jobs are executed in parallel. -1. If all jobs of `deploy` succeed, the commit is marked as `success`. +1. If all jobs of `deploy` succeed, the commit is marked as `passed`. 1. If any of the previous jobs fails, the commit is marked as `failed` and no jobs of further stage are executed. diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 56f58fd755a..daa5463d680 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -115,10 +115,12 @@ pages. Depending on the status of your job, a badge can have the following values: +- pending - running -- success +- passed - failed - skipped +- canceled - unknown You can access a pipeline status badge image using the following link: |