summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGennady Trafimenkov <gennady.trafimenkov@gmail.com>2016-08-05 09:31:45 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-10 16:03:26 +0200
commitee2d392255ceb4669f87ef0589535f0e61f2430f (patch)
treeb9d5c51f01cb99ec5f86fd69d2479b612b61084e
parent359b4f9a0303e3b55004c7d4d6cacc1ef8e6e25f (diff)
downloadgitlab-ce-ee2d392255ceb4669f87ef0589535f0e61f2430f.tar.gz
Clarify which token should be used to delete a runner
-rw-r--r--CHANGELOG1
-rw-r--r--doc/api/ci/runners.md6
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bee5bc769ca..26ec441c27f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -483,6 +483,7 @@ v 8.11.0
- Add pipeline events hook
- Bump gitlab_git to speedup DiffCollection iterations
- Rewrite description of a blocked user in admin settings. (Elias Werberich)
+ - Clarify documentation for Runners API (Gennady Trafimenkov)
- Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial
- Convert image diff background image to CSS (ClemMakesApps)
diff --git a/doc/api/ci/runners.md b/doc/api/ci/runners.md
index ecec53fde03..16028d1f124 100644
--- a/doc/api/ci/runners.md
+++ b/doc/api/ci/runners.md
@@ -12,7 +12,9 @@ communication channel. For the consumer API see the
This API uses two types of authentication:
1. Unique Runner's token, which is the token assigned to the Runner after it
- has been registered.
+ has been registered. This token can be found on the Runner's edit page (go to
+ **Project > Runners**, select one of the Runners listed under **Runners activated for
+ this project**).
2. Using Runners' registration token.
This is a token that can be found in project's settings.
@@ -48,7 +50,7 @@ DELETE /ci/api/v1/runners/delete
| Attribute | Type | Required | Description |
| --------- | ------- | --------- | ----------- |
-| `token` | string | yes | Runner's registration token |
+| `token` | string | yes | Unique Runner's token |
Example request: