diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-21 09:15:00 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 09:15:00 +0000 |
| commit | 825548140c47d84a116358052891962a8ffd9b55 (patch) | |
| tree | cba2cd555d29f765e75bce31b0c95f4e883beeb8 /doc | |
| parent | 85a539e8ff460559e61bb7b9409864c8e6e3978a (diff) | |
| parent | 2a9d773e2832dde166ffb2cd55c0e4753eb65646 (diff) | |
| download | gitlab-ce-825548140c47d84a116358052891962a8ffd9b55.tar.gz | |
Merge branch 'doc-award-emoji' into 'master'
Update doc for award emoji API
## What does this MR do?
It fixes some docs for the award emoji API.
## Are there points in the code the reviewer needs to double check?
@zj I'm assigning you since you wrote this docs.
## Does this MR meet the acceptance criteria?
~~- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
~~- [ ] API support added~~
~~- Tests~~
~~- [ ] Added for this feature/bug~~
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5386
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/award_emoji.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/award_emoji.md b/doc/api/award_emoji.md index b44f8cfd628..796b3680a75 100644 --- a/doc/api/award_emoji.md +++ b/doc/api/award_emoji.md @@ -67,9 +67,9 @@ Example Response: ] ``` -### Get single issue note +### Get single award emoji -Gets a single award emoji +Gets a single award emoji from an issue or merge request. ``` GET /projects/:id/issues/:issue_id/award_emoji/:award_id |