summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-02-17 23:00:12 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-02-17 23:00:12 +0000
commit721ae6bef6c369a74112bd0adc3202e3c0a206ee (patch)
treecbac70b4f8c583866ace25ce8f5f8ab21a055d5e
parent13ad37d8c252f4e4cd7d954bebc0795f443cbf39 (diff)
parenta5d04597b7c561fecb67646e25ba9cd4aef86325 (diff)
downloadgitlab-ce-721ae6bef6c369a74112bd0adc3202e3c0a206ee.tar.gz
Merge branch '28313-words' into 'master'
Fix job status -> pipeline status Closes #28313 See merge request !9320
-rw-r--r--doc/ci/pipelines.md2
-rw-r--r--doc/user/project/pipelines/settings.md8
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index 9d294240d9d..db92a4b0d80 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -91,7 +91,7 @@ total running time should be:
## Badges
-Job status and test coverage report badges are available. You can find their
+Pipeline status and test coverage report badges are available. You can find their
respective link in the [Pipelines settings] page.
[jobs]: #jobs
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index 80cdb49a1d3..c398ac2eb25 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -62,9 +62,9 @@ pipelines** checkbox and save the changes.
## Badges
-In the pipelines settings page you can find job status and test coverage
+In the pipelines settings page you can find pipeline status and test coverage
badges for your project. The latest successful pipeline will be used to read
-the job status and test coverage values.
+the pipeline status and test coverage values.
Visit the pipelines settings page in your project to see the exact link to
your badges, as well as ways to embed the badge image in your HTML or Markdown
@@ -72,7 +72,7 @@ pages.
![Pipelines badges](img/pipelines_settings_badges.png)
-### Job status badge
+### Pipeline status badge
Depending on the status of your job, a badge can have the following values:
@@ -82,7 +82,7 @@ Depending on the status of your job, a badge can have the following values:
- skipped
- unknown
-You can access a job status badge image using the following link:
+You can access a pipeline status badge image using the following link:
```
https://example.gitlab.com/<namespace>/<project>/badges/<branch>/build.svg