Commit 2232b56d authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'award-emoji-docs' into 'master'

Expand on Award Emoji documentation, update/add screenshots.

Adds documentation for award emoji now that comments can be awarded with emojis.

See also !4291 and #18906 

Closes #9091

cc: @virtuacreative @axil 

See merge request !4839
parents e1917b56 a6faaace
# Award emojis # Award emoji
>**Note:** >**Note:**
This feature was [introduced][1825] in GitLab 8.2. This feature was [introduced][1825] in GitLab 8.2.
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. In order to make virtual celebrations easier, you can now vote and thumbs-ups. Emoji can be awarded to issues and merge requests, making
on issues and merge requests using emoji! virtual celebrations easier.
![Award emoji](img/award_emoji_select.png) ![Award emoji](img/award_emoji_select.png)
This makes it much easier to give and receive feedback, without a long comment Award emoji make it much easier to give and receive feedback without a long
thread. Any comment that contains only the thumbs up or down emojis is comment thread. Comments that are only emoji will automatically become
converted to a vote and depicted in the emoji area. award emoji.
You can then use that functionality to sort issues and merge requests based on
popularity.
## Sort issues and merge requests on vote count ## Sort issues and merge requests on vote count
>**Note:** >**Note:**
This feature was [introduced][2871] in GitLab 8.5. This feature was [introduced][2871] in GitLab 8.5.
You can quickly sort the issues or merge requests by the number of votes they You can quickly sort issues and merge requests by the number of votes they
have received. The sort option can be found in the right dropdown menu. have received. The sort options can be found in the dropdown menu as "Most
popular" and "Least popular".
![Votes sort options](img/award_emoji_votes_sort_options.png) ![Votes sort options](img/award_emoji_votes_sort_options.png)
...@@ -40,9 +38,28 @@ Sort by least popular issues/merge requests. ...@@ -40,9 +38,28 @@ Sort by least popular issues/merge requests.
--- ---
The number of upvotes and downvotes is not summed up. That means that an issue The total number of votes is not summed up. An issue with 18 upvotes and 5
with 18 upvotes and 5 downvotes is considered more popular than an issue with downvotes is considered more popular than an issue with 17 upvotes and no
17 upvotes and no downvotes. downvotes.
## Award emoji for comments
>**Note:**
This feature was [introduced][4291] in GitLab 8.9.
Award emoji can also be applied to individual comments when you want to
celebrate an accomplishment or agree with an opinion.
To add an award emoji, click the smile in the top right of the comment and pick
an emoji from the dropdown.
![Picking an emoji for a comment](img/award_emoji_comment_picker.png)
![An award emoji has been applied to a comment](img/award_emoji_comment_awarded.png)
If you want to remove an award emoji, just click the emoji again and the vote
will be removed.
[2871]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2781 [2871]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2781
[1825]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1825 [1825]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1825
[4291]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4291
doc/workflow/award_emoji.png

6.46 KB | W: | H:

doc/workflow/award_emoji.png

16.5 KB | W: | H:

doc/workflow/award_emoji.png
doc/workflow/award_emoji.png
doc/workflow/award_emoji.png
doc/workflow/award_emoji.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment