diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-23 17:09:13 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-23 17:09:13 +0100 |
| commit | b69c2c11230d274fd9e6228fdcacc514f15b638f (patch) | |
| tree | f7ea4a1d87f401880defcb2b352f6edf460ba159 | |
| parent | 4740848a8783d2744a32c506e69face6fef26a64 (diff) | |
| download | gitlab-ce-b69c2c11230d274fd9e6228fdcacc514f15b638f.tar.gz | |
Merge notes in API docs
[ci skip]
| -rw-r--r-- | doc/api/access_requests.md | 6 | ||||
| -rw-r--r-- | doc/api/award_emoji.md | 2 | ||||
| -rw-r--r-- | doc/api/broadcast_messages.md | 2 | ||||
| -rw-r--r-- | doc/api/version.md | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/api/access_requests.md b/doc/api/access_requests.md index c14a56a5c44..49a61c02f16 100644 --- a/doc/api/access_requests.md +++ b/doc/api/access_requests.md @@ -5,11 +5,11 @@ The `https://gitlab.example.com` URL that is presented in the examples of the API docs is fictional. Replace it with the URL of your GitLab instance, or in case of GitLab.com, use `https://gitlab.com`. - >**Note:** This feature was introduced in GitLab 8.11 +>Introduced in GitLab 8.11. - **Valid access levels** +**Valid access levels** - The access levels are defined in the `Gitlab::Access` module. Currently, these levels are recognized: +The access levels are defined in the `Gitlab::Access` module. Currently, these levels are recognized: ``` 10 => Guest access diff --git a/doc/api/award_emoji.md b/doc/api/award_emoji.md index 2017727ca19..9081820b305 100644 --- a/doc/api/award_emoji.md +++ b/doc/api/award_emoji.md @@ -5,7 +5,7 @@ The `https://gitlab.example.com` URL that is presented in the examples of the API docs is fictional. Replace it with the URL of your GitLab instance, or in case of GitLab.com, use `https://gitlab.com`. -> [Introduced][ce-4575] in GitLab 8.9, Snippet support in 8.12 +>[Introduced][ce-4575] in GitLab 8.9, snippet support in 8.12. An awarded emoji tells a thousand words, and can be awarded on issues, merge diff --git a/doc/api/broadcast_messages.md b/doc/api/broadcast_messages.md index fb7d1cf5ddd..2729e09c51c 100644 --- a/doc/api/broadcast_messages.md +++ b/doc/api/broadcast_messages.md @@ -5,7 +5,7 @@ The `https://gitlab.example.com` URL that is presented in the examples of the API docs is fictional. Replace it with the URL of your GitLab instance, or in case of GitLab.com, use `https://gitlab.com`. -> **Note:** This feature was introduced in GitLab 8.12. +>Introduced in GitLab 8.12. The broadcast message API is only accessible to administrators. All requests by guests will respond with `401 Unauthorized`, and all requests by normal users diff --git a/doc/api/version.md b/doc/api/version.md index f71c39c9b63..368b579c849 100644 --- a/doc/api/version.md +++ b/doc/api/version.md @@ -5,7 +5,7 @@ The `https://gitlab.example.com` URL that is presented in the examples of the API docs is fictional. Replace it with the URL of your GitLab instance, or in case of GitLab.com, use `https://gitlab.com`. ->**Note:** This feature was introduced in GitLab 8.13 +>Introduced in GitLab 8.13. Retrieve version information for this GitLab instance. Responds `200 OK` for authenticated users. |