summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-02-17 23:00:12 +0000
committerFelipe Artur <felipefac@gmail.com>2017-02-20 11:02:42 -0300
commitdcd90c28452a98295919a30430aa60b80b369236 (patch)
tree471e3738d437eb52e98ccd99ac18b910c0c38d35
parent7658311488a2cf135fc1c4f002e5f857828cd43d (diff)
downloadgitlab-ce-dcd90c28452a98295919a30430aa60b80b369236.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 3134405e10b..6be4cb03fab 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