Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a843fccf
Commit
a843fccf
authored
Jan 15, 2019
by
Evan Read
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Continue addressing review feedback
parent
9ca5909d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
45 deletions
+44
-45
doc/api/award_emoji.md
doc/api/award_emoji.md
+42
-42
doc/user/award_emojis.md
doc/user/award_emojis.md
+2
-3
No files found.
doc/api/award_emoji.md
View file @
a843fccf
...
@@ -28,10 +28,10 @@ GET /projects/:id/snippets/:snippet_id/award_emoji
...
@@ -28,10 +28,10 @@ GET /projects/:id/snippets/:snippet_id/award_emoji
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable.
|
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable. |
Example request:
Example request:
...
@@ -90,11 +90,11 @@ GET /projects/:id/snippets/:snippet_id/award_emoji/:award_id
...
@@ -90,11 +90,11 @@ GET /projects/:id/snippets/:snippet_id/award_emoji/:award_id
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable.
|
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable. |
|
`award_id`
| integer | yes | ID of the award emoji.
|
|
`award_id`
| integer | yes | ID of the award emoji. |
Example request:
Example request:
...
@@ -135,11 +135,11 @@ POST /projects/:id/snippets/:snippet_id/award_emoji
...
@@ -135,11 +135,11 @@ POST /projects/:id/snippets/:snippet_id/award_emoji
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable.
|
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable. |
|
`name`
| string | yes | Name of the emoji without colons.
|
|
`name`
| string | yes | Name of the emoji without colons. |
```
sh
```
sh
curl
--request
POST
--header
"PRIVATE-TOKEN: <your_access_token>"
https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji?name
=
blowfish
curl
--request
POST
--header
"PRIVATE-TOKEN: <your_access_token>"
https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji?name
=
blowfish
...
@@ -181,11 +181,11 @@ DELETE /projects/:id/snippets/:snippet_id/award_emoji/:award_id
...
@@ -181,11 +181,11 @@ DELETE /projects/:id/snippets/:snippet_id/award_emoji/:award_id
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable.
|
|
`awardable_id`
| integer | yes | ID (
`iid`
for merge requests/issues,
`id`
for snippets) of an awardable. |
|
`award_id`
| integer | yes | ID of an award emoji.
|
|
`award_id`
| integer | yes | ID of an award emoji. |
```
sh
```
sh
curl
--request
DELETE
--header
"PRIVATE-TOKEN: <your_access_token>"
https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/344
curl
--request
DELETE
--header
"PRIVATE-TOKEN: <your_access_token>"
https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/344
...
@@ -209,11 +209,11 @@ GET /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji
...
@@ -209,11 +209,11 @@ GET /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`issue_iid`
| integer | yes | Internal ID of an issue.
|
|
`issue_iid`
| integer | yes | Internal ID of an issue. |
|
`note_id`
| integer | yes | ID of a comment (note).
|
|
`note_id`
| integer | yes | ID of a comment (note). |
Example request:
Example request:
...
@@ -254,12 +254,12 @@ GET /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji/:award_id
...
@@ -254,12 +254,12 @@ GET /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji/:award_id
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`issue_iid`
| integer | yes | Internal ID of an issue.
|
|
`issue_iid`
| integer | yes | Internal ID of an issue. |
|
`note_id`
| integer | yes | ID of a comment (note).
|
|
`note_id`
| integer | yes | ID of a comment (note). |
|
`award_id`
| integer | yes | ID of the award emoji.
|
|
`award_id`
| integer | yes | ID of the award emoji. |
Example request:
Example request:
...
@@ -298,12 +298,12 @@ POST /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji
...
@@ -298,12 +298,12 @@ POST /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`issue_iid`
| integer | yes | Internal ID of an issue.
|
|
`issue_iid`
| integer | yes | Internal ID of an issue. |
|
`note_id`
| integer | yes | ID of a comment (note).
|
|
`note_id`
| integer | yes | ID of a comment (note). |
|
`name`
| string | yes | Name of the emoji without colons.
|
|
`name`
| string | yes | Name of the emoji without colons. |
Example request:
Example request:
...
@@ -345,12 +345,12 @@ DELETE /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji/:award_id
...
@@ -345,12 +345,12 @@ DELETE /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji/:award_id
Parameters:
Parameters:
| Attribute | Type | Required | Description
|
| Attribute | Type | Required | Description |
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------
--------------------------------
|
|:------------|:---------------|:---------|:-----------------------------------------------------------------------------|
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
. |
|
`id`
| integer/string | yes | ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
. |
|
`issue_iid`
| integer | yes | Internal ID of an issue.
|
|
`issue_iid`
| integer | yes | Internal ID of an issue. |
|
`note_id`
| integer | yes | ID of a comment (note).
|
|
`note_id`
| integer | yes | ID of a comment (note). |
|
`award_id`
| integer | yes | ID of an award_emoji.
|
|
`award_id`
| integer | yes | ID of an award_emoji. |
Example request:
Example request:
...
...
doc/user/award_emojis.md
View file @
a843fccf
...
@@ -7,13 +7,12 @@
...
@@ -7,13 +7,12 @@
When you're collaborating online, you get fewer opportunities for high-fives
When you're collaborating online, you get fewer opportunities for high-fives
and thumbs-ups. Emoji can be awarded to
[
issues
](
project/issues/index.md
)
,
[
merge requests
](
project/merge_requests/index.md
)
,
and thumbs-ups. Emoji can be awarded to
[
issues
](
project/issues/index.md
)
,
[
merge requests
](
project/merge_requests/index.md
)
,
[
snippets
](
snippets.md
)
, and
virtually everywhere
where you can have a discussion.
[
snippets
](
snippets.md
)
, and
any
where you can have a discussion.
![
Award emoji
](
img/award_emoji_select.png
)
![
Award emoji
](
img/award_emoji_select.png
)
Award emoji make it much easier to give and receive feedback without a long
Award emoji make it much easier to give and receive feedback without a long
comment thread. Comments that are only emoji will automatically become
comment thread.
award emoji.
For information on the relevant API, see
[
Award Emoji API
](
../api/award_emoji.md
)
.
For information on the relevant API, see
[
Award Emoji API
](
../api/award_emoji.md
)
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment