diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-10 13:13:19 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-10 13:13:19 +0000 |
| commit | b26a3d538178c82d4e7af2076ba999087225666c (patch) | |
| tree | 09a025ff2029c6d0e4a27edfc6b9acc6184261d1 | |
| parent | 6f18c0a0b07a91af31cea914a9f9f07529279d29 (diff) | |
| parent | ef7f16faaa2e640d7b5453174c1af72decd08217 (diff) | |
| download | gitlab-ce-b26a3d538178c82d4e7af2076ba999087225666c.tar.gz | |
Merge branch 'fix-typo_doc-api-labels.md' into 'master'
Fix a typo in doc/api/labels.md
See merge request !6760
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/api/labels.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 24c7ae64301..72e146f4f3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -81,6 +81,7 @@ v 8.13.0 (unreleased) - Retouch environments list and deployments list - Add Container Registry on/off status to Admin Area !6638 (the-undefined) - Grouped pipeline dropdown is a scrollable container + - Fix a typo in doc/api/labels.md v 8.12.5 (unreleased) diff --git a/doc/api/labels.md b/doc/api/labels.md index 3653ccf304a..656232cc940 100644 --- a/doc/api/labels.md +++ b/doc/api/labels.md @@ -148,7 +148,7 @@ PUT /projects/:id/labels | --------------- | ------- | --------------------------------- | ------------------------------- | | `id` | integer | yes | The ID of the project | | `name` | string | yes | The name of the existing label | -| `new_name` | string | yes if `color` if not provided | The new name of the label | +| `new_name` | string | yes if `color` is not provided | The new name of the label | | `color` | string | yes if `new_name` is not provided | The new color of the label in 6-digit hex notation with leading `#` sign | | `description` | string | no | The new description of the label | |