From ba836eea909bb5ffbc435f8e03eaf0dbd10a665f Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Fri, 12 May 2023 17:33:43 +0200 Subject: [PATCH] Rename Award Emojis to emoji reactions https://gitlab.com/gitlab-org/gitlab/-/issues/409884 --- doc/api/api_resources.md | 2 +- doc/api/award_emoji.md | 60 ++++++++++--------- doc/api/graphql/getting_started.md | 4 +- doc/api/notes.md | 6 +- .../contributing/issue_workflow.md | 2 +- doc/development/fe_guide/emojis.md | 2 +- .../incident_management/status_page.md | 4 +- .../application_security/api_fuzzing/index.md | 4 +- .../api_security/api_discovery/index.md | 2 +- .../application_security/dast_api/index.md | 4 +- doc/user/award_emojis.md | 23 +++---- doc/user/group/epics/index.md | 2 +- doc/user/markdown.md | 2 +- doc/user/profile/account/delete_account.md | 2 +- .../project/issues/sorting_issue_lists.md | 2 +- doc/user/project/quick_actions.md | 2 +- doc/user/project/settings/import_export.md | 2 +- doc/user/todos.md | 2 +- 18 files changed, 65 insertions(+), 62 deletions(-) diff --git a/doc/api/api_resources.md b/doc/api/api_resources.md index bc4521c98573ce..4a70786b6eee27 100644 --- a/doc/api/api_resources.md +++ b/doc/api/api_resources.md @@ -26,7 +26,6 @@ The following API resources are available in the project context: | [Access requests](access_requests.md) | `/projects/:id/access_requests` (also available for groups) | | [Access tokens](project_access_tokens.md) | `/projects/:id/access_tokens` (also available for groups) | | [Agents](cluster_agents.md) | `/projects/:id/cluster_agents` | -| [Award emoji](award_emoji.md) | `/projects/:id/issues/.../award_emoji`, `/projects/:id/merge_requests/.../award_emoji`, `/projects/:id/snippets/.../award_emoji` | | [Branches](branches.md) | `/projects/:id/repository/branches/`, `/projects/:id/repository/merged_branches` | | [Commits](commits.md) | `/projects/:id/repository/commits`, `/projects/:id/statuses` | | [Container Registry](container_registry.md) | `/projects/:id/registry/repositories` | @@ -41,6 +40,7 @@ The following API resources are available in the project context: | [Deployments](deployments.md) | `/projects/:id/deployments` | | [Discussions](discussions.md) (threaded comments) | `/projects/:id/issues/.../discussions`, `/projects/:id/snippets/.../discussions`, `/projects/:id/merge_requests/.../discussions`, `/projects/:id/commits/.../discussions` (also available for groups) | | [Draft Notes](draft_notes.md) (comments) | `/projects/:id/merge_requests/.../draft_notes` +| [Emoji reactions](award_emoji.md) | `/projects/:id/issues/.../award_emoji`, `/projects/:id/merge_requests/.../award_emoji`, `/projects/:id/snippets/.../award_emoji` | | [Environments](environments.md) | `/projects/:id/environments` | | [Error Tracking](error_tracking.md) | `/projects/:id/error_tracking/settings` | | [Events](events.md) | `/projects/:id/events` (also available for users and standalone) | diff --git a/doc/api/award_emoji.md b/doc/api/award_emoji.md index a669c6d00c3086..a22c61b3391655 100644 --- a/doc/api/award_emoji.md +++ b/doc/api/award_emoji.md @@ -4,28 +4,30 @@ group: Project Management info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Award emojis API **(FREE)** +# Emoji reactions API **(FREE)** -An [awarded emoji](../user/award_emojis.md) tells a thousand words. +> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from "award emojis" to "emoji reactions" in GitLab 16.0. -We call GitLab objects on which you can award an emoji "awardables". You can award emojis on the following: +An [emoji reaction](../user/award_emojis.md) tells a thousand words. + +We call GitLab objects on which you can react with an emoji "awardables". +You can react with emojis on the following: - [Epics](../user/group/epics/index.md) ([API](epics.md)). **(PREMIUM)** - [Issues](../user/project/issues/index.md) ([API](issues.md)). - [Merge requests](../user/project/merge_requests/index.md) ([API](merge_requests.md)). - [Snippets](../user/snippets.md) ([API](snippets.md)). - -Emojis can also [be awarded](../user/award_emojis.md#award-emojis-for-comments) on comments (also known as notes). See also [Notes API](notes.md). +- [Comments](../user/award_emojis.md#emoji-reactions-for-comments) ([API](notes.md)). ## Issues, merge requests, and snippets -See [Award emojis on comments](#award-emojis-on-comments) for information on using these endpoints with comments. +For information on using these endpoints with comments, see [Add reactions to comments](#add-reactions-to-comments). -### List an awardable's award emojis +### List an awardable's emoji reactions > [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/335068) in GitLab 15.1 to allow unauthenticated access to public awardables. -Get a list of all award emojis for a specified awardable. This endpoint can +Get a list of all emoji reactions for a specified awardable. This endpoint can be accessed without authentication if the awardable is publicly accessible. ```plaintext @@ -86,11 +88,11 @@ Example response: ] ``` -### Get single award emoji +### Get single emoji reaction > [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/335068) in GitLab 15.1 to allow unauthenticated access to public awardables. -Get a single award emoji from an issue, snippet, or merge request. This endpoint can +Get a single emoji reaction from an issue, snippet, or merge request. This endpoint can be accessed without authentication if the awardable is publicly accessible. ```plaintext @@ -105,7 +107,7 @@ Parameters: |:---------------|:---------------|:---------|:-----------------------------------------------------------------------------| | `id` | integer/string | yes | ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `issue_iid`/`merge_request_iid`/`snippet_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 emoji reaction. | Example request: @@ -134,9 +136,9 @@ Example response: } ``` -### Award a new emoji +### Add a new emoji reaction -Create an award emoji on the specified awardable. +Add an emoji reaction on the specified awardable. ```plaintext POST /projects/:id/issues/:issue_iid/award_emoji @@ -177,11 +179,11 @@ Example Response: } ``` -### Delete an award emoji +### Delete an emoji reaction -Sometimes it's just not meant to be and you need to remove the award. +Sometimes it's just not meant to be and you need to remove your reaction. -Only an administrator or the author of the award can delete an award emoji. +Only an administrator or the author of the reaction can delete an emoji reaction. ```plaintext DELETE /projects/:id/issues/:issue_iid/award_emoji/:award_id @@ -195,26 +197,26 @@ Parameters: |:---------------|:---------------|:---------|:-----------------------------------------------------------------------------| | `id` | integer/string | yes | ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `issue_iid`/`merge_request_iid`/`snippet_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 emoji reaction. | ```shell curl --request DELETE --header "PRIVATE-TOKEN: " "https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/344" ``` -## Award emojis on comments +## Add reactions to comments Comments (also known as notes) are a sub-resource of issues, merge requests, and snippets. NOTE: -The examples below describe working with award emojis on an issue's comments, but can be +The examples below describe working with emoji reactions on an issue's comments, but can be adapted to comments on merge requests and snippets. Therefore, you have to replace `issue_iid` either with `merge_request_iid` or with the `snippet_id`. -### List a comment's award emojis +### List a comment's emoji reactions > [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/335068) in GitLab 15.1 to allow unauthenticated access to public comments. -Get all award emojis for a comment (note). This endpoint can +Get all emoji reactions for a comment (note). This endpoint can be accessed without authentication if the comment is publicly accessible. ```plaintext @@ -258,11 +260,11 @@ Example response: ] ``` -### Get an award emoji for a comment +### Get an emoji reaction for a comment > [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/335068) in GitLab 15.1 to allow unauthenticated access to public comments. -Get a single award emoji for a comment (note). This endpoint can +Get a single emoji reaction for a comment (note). This endpoint can be accessed without authentication if the comment is publicly accessible. ```plaintext @@ -276,7 +278,7 @@ Parameters: | `id` | integer/string | yes | ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `issue_iid` | integer | yes | Internal ID of an issue. | | `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 emoji reaction. | Example request: @@ -307,7 +309,7 @@ Example response: ### Award a new emoji on a comment -Create an award emoji on the specified comment (note). +Create an emoji reaction on the specified comment (note). ```plaintext POST /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji @@ -349,11 +351,11 @@ Example response: } ``` -### Delete an award emoji from a comment +### Delete an emoji reaction from a comment -Sometimes it's just not meant to be and you need to remove the award. +Sometimes it's just not meant to be and you need to remove the reaction. -Only an administrator or the author of the award can delete an award emoji. +Only an administrator or the author of the reaction can delete an emoji reaction. ```plaintext DELETE /projects/:id/issues/:issue_iid/notes/:note_id/award_emoji/:award_id @@ -366,7 +368,7 @@ Parameters: | `id` | integer/string | yes | ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `issue_iid` | integer | yes | Internal ID of an issue. | | `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 emoji reaction. | Example request: diff --git a/doc/api/graphql/getting_started.md b/doc/api/graphql/getting_started.md index e5f58c7efa885d..237c0cc693465f 100644 --- a/doc/api/graphql/getting_started.md +++ b/doc/api/graphql/getting_started.md @@ -183,7 +183,7 @@ Mutations generally use InputTypes and variables, neither of which appear here. Mutations have: -- Inputs. For example, arguments, such as which emoji you'd like to award, +- Inputs. For example, arguments, such as which emoji reaction you'd like to add, and to which object. - Return statements. That is, what you'd like to get back when it's successful. - Errors. Always ask for what went wrong, just in case. @@ -299,7 +299,7 @@ mutation DisableCI_JOB_TOKENscope { inboundJobTokenScopeEnabled jobTokenScopeEnabled } - errors + errors } } ``` diff --git a/doc/api/notes.md b/doc/api/notes.md index bdcbbdf972841f..41b4ab7fd9ab2c 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -272,7 +272,7 @@ curl --header "PRIVATE-TOKEN: " "https://gitlab.example.com/a ### Create new snippet note Creates a new note for a single snippet. Snippet notes are user comments on snippets. -If you create a note where the body only contains an Award Emoji, GitLab returns this object. +If you create a note where the body only contains an emoji reaction, GitLab returns this object. ```plaintext POST /projects/:id/snippets/:snippet_id/notes @@ -408,7 +408,7 @@ lines in a merge request. For other approaches with more granular control, see and [Create a new thread in the merge request diff](discussions.md#create-a-new-thread-in-the-merge-request-diff) in the Discussions API. -If you create a note where the body only contains an award emoji, GitLab returns this object. +If you create a note where the body only contains an emoji reaction, GitLab returns this object. ```plaintext POST /projects/:id/merge_requests/:merge_request_iid/notes @@ -542,7 +542,7 @@ curl --header "PRIVATE-TOKEN: " "https://gitlab.example.com/a ### Create new epic note Creates a new note for a single epic. Epic notes are comments users can post to an epic. -If you create a note where the body only contains an Award Emoji, GitLab returns this object. +If you create a note where the body only contains an emoji reaction, GitLab returns this object. ```plaintext POST /groups/:id/epics/:epic_id/notes diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index 583b39ebe56485..50e87fc53412d3 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w **Before you submit an issue, [search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues)** for similar entries. Someone else might have already had the same bug or feature proposal. -If you find an existing issue, show your support with an award emoji and add your notes to the discussion. +If you find an existing issue, show your support with an emoji reaction and add your notes to the discussion. To submit a bug: diff --git a/doc/development/fe_guide/emojis.md b/doc/development/fe_guide/emojis.md index 3296783a61654c..c93e1bb34c54c4 100644 --- a/doc/development/fe_guide/emojis.md +++ b/doc/development/fe_guide/emojis.md @@ -30,7 +30,7 @@ when your platform does not support it. - Negative intent should be set to `1.5`. 1. Ensure you see new individual images copied into `app/assets/images/emoji/` 1. Ensure you can see the new emojis and their aliases in the GitLab Flavored Markdown (GLFM) Autocomplete - 1. Ensure you can see the new emojis and their aliases in the award emoji menu + 1. Ensure you can see the new emojis and their aliases in the emoji reactions menu 1. You might need to add new emoji Unicode support checks and rules for platforms that do not support a certain emoji and we need to fallback to an image. See `app/assets/javascripts/emoji/support/is_emoji_unicode_supported.js` diff --git a/doc/operations/incident_management/status_page.md b/doc/operations/incident_management/status_page.md index 5dd690a1c9fcb8..fd37279806f7a4 100644 --- a/doc/operations/incident_management/status_page.md +++ b/doc/operations/incident_management/status_page.md @@ -159,13 +159,13 @@ To publish comments to the Status Page Incident: - Create a comment on the incident issue. - When you're ready to publish the comment, mark the comment for publication by - adding a microphone [award emoji](../../user/award_emojis.md) + adding a microphone [emoji reaction](../../user/award_emojis.md) reaction (`:microphone:` 🎤) to the comment. - Any files attached to the comment (up to 5000 per issue) are also published. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/205166) in GitLab 13.1.) WARNING: -Anyone with access to view the Issue can add an emoji award to a comment, so +Anyone with access to view the Issue can add an emoji reaction to a comment, so consider limiting access to issues to team members only. ### Update the incident status diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md index c0ba764e706c3f..b613b0cc33ee89 100644 --- a/doc/user/application_security/api_fuzzing/index.md +++ b/doc/user/application_security/api_fuzzing/index.md @@ -2762,7 +2762,7 @@ The following example uses the [statically defined credentials](../../../ci/dock Starting service registry.example.com/my-target-app:latest ... Authenticating with credentials from $DOCKER_AUTH_CONFIG Pulling docker image registry.example.com/my-target-app:latest ... - Using docker image sha256:139c39668e5e4417f7d0eb0eeb74145ba862f4f3c24f7c6594ecb2f82dc4ad06 for registry.example.com/my-target-app:latest with digest registry.example.com/my-target- + Using docker image sha256:139c39668e5e4417f7d0eb0eeb74145ba862f4f3c24f7c6594ecb2f82dc4ad06 for registry.example.com/my-target-app:latest with digest registry.example.com/my-target- app@sha256:2b69fc7c3627dbd0ebaa17674c264fcd2f2ba21ed9552a472acf8b065d39039c ... Waiting for services to be up and running (timeout 30 seconds)... ``` @@ -2774,7 +2774,7 @@ To get support for your particular problem use the [getting help channels](https The [GitLab issue tracker on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues) is the right place for bugs and feature proposals about API Security and API Fuzzing. Use `~"Category:API Security"` [label](../../../development/labels/index.md) when opening a new issue regarding API fuzzing to ensure it is quickly reviewed by the right people. Refer to our [review response SLO](https://about.gitlab.com/handbook/engineering/workflow/code-review/#review-response-slo) to understand when you should receive a response. -[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion. +[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an emoji reaction or join the discussion. When experiencing a behavior not working as expected, consider providing contextual information: diff --git a/doc/user/application_security/api_security/api_discovery/index.md b/doc/user/application_security/api_security/api_discovery/index.md index b87c7f40663d66..95b532496536fe 100644 --- a/doc/user/application_security/api_security/api_discovery/index.md +++ b/doc/user/application_security/api_security/api_discovery/index.md @@ -166,7 +166,7 @@ To get support for your particular problem, use the [getting help channels](http The [GitLab issue tracker on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues) is the right place for bugs and feature proposals about API Discovery. Use `~"Category:API Security"` [label](../../../../development/labels/index.md) when opening a new issue regarding API Discovery to ensure it is quickly reviewed by the right people. Refer to our [review response SLO](https://about.gitlab.com/handbook/engineering/workflow/code-review/#review-response-slo) to understand when you should receive a response. -[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion. +[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an emoji reaction or join the discussion. When experiencing a behavior not working as expected, consider providing contextual information: diff --git a/doc/user/application_security/dast_api/index.md b/doc/user/application_security/dast_api/index.md index 0daa44aec16c9e..d494259ecc493e 100644 --- a/doc/user/application_security/dast_api/index.md +++ b/doc/user/application_security/dast_api/index.md @@ -2630,7 +2630,7 @@ The following example uses the [statically defined credentials](../../../ci/dock Starting service registry.example.com/my-target-app:latest ... Authenticating with credentials from $DOCKER_AUTH_CONFIG Pulling docker image registry.example.com/my-target-app:latest ... - Using docker image sha256:139c39668e5e4417f7d0eb0eeb74145ba862f4f3c24f7c6594ecb2f82dc4ad06 for registry.example.com/my-target-app:latest with digest registry.example.com/my-target- + Using docker image sha256:139c39668e5e4417f7d0eb0eeb74145ba862f4f3c24f7c6594ecb2f82dc4ad06 for registry.example.com/my-target-app:latest with digest registry.example.com/my-target- app@sha256:2b69fc7c3627dbd0ebaa17674c264fcd2f2ba21ed9552a472acf8b065d39039c ... Waiting for services to be up and running (timeout 30 seconds)... ``` @@ -2642,7 +2642,7 @@ To get support for your particular problem, use the [getting help channels](http The [GitLab issue tracker on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues) is the right place for bugs and feature proposals about API Security and DAST API. Use `~"Category:API Security"` [label](../../../development/labels/index.md) when opening a new issue regarding DAST API to ensure it is quickly reviewed by the right people. Refer to our [review response SLO](https://about.gitlab.com/handbook/engineering/workflow/code-review/#review-response-slo) to understand when you should receive a response. -[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion. +[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an emoji reaction or join the discussion. When experiencing a behavior not working as expected, consider providing contextual information: diff --git a/doc/user/award_emojis.md b/doc/user/award_emojis.md index 29ca6fe8d98f03..c3aad86461b28d 100644 --- a/doc/user/award_emojis.md +++ b/doc/user/award_emojis.md @@ -4,12 +4,13 @@ group: Project Management info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Award emojis **(FREE)** +# Emoji reactions **(FREE)** -> Awarding emojis to work items (such as tasks, objectives, and key results) [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/393599) in GitLab 16.0. +> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from "award emojis" to "emoji reactions" in GitLab 16.0. +> - Reacting with emojis on work items (such as tasks, objectives, and key results) [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/393599) in GitLab 16.0. When you're collaborating online, you get fewer opportunities for high-fives -and thumbs-ups. Add award emojis to: +and thumbs-ups. React with emojis on: - [Issues](project/issues/index.md). - [Tasks](tasks.md). @@ -19,12 +20,12 @@ and thumbs-ups. Add award emojis to: - [Objectives and key results](okrs.md). - Anywhere else you can have a comment thread. -![Award emoji](img/award_emoji_select_v14_6.png) +![Emoji reactions](img/award_emoji_select_v14_6.png) -Award emojis make it much easier to give and receive feedback without a long +Emoji reactions make it much easier to give and receive feedback without a long comment thread. -For information on the relevant API, see [Award Emoji API](../api/award_emoji.md). +For information on the relevant API, see [Emoji reactions API](../api/award_emoji.md). ## Sort issues and merge requests on vote count @@ -38,17 +39,17 @@ The total number of votes is not summed up. An issue with 18 upvotes and 5 downvotes is considered more popular than an issue with 17 upvotes and no downvotes. -## Award emojis for comments +## Emoji reactions for comments -Award emojis can also be applied to individual comments when you want to +Emoji reactions can also be applied to individual comments when you want to celebrate an accomplishment or agree with an opinion. -To add an award emoji: +To add an emoji reaction: 1. In the upper-right corner of the comment, select the smile (**{slight-smile}**). -1. Select an emoji from the dropdown list. +1. Select an emoji from the emoji picker. -To remove an award emoji, select the emoji again. +To remove an emoji reaction, select the emoji again. ## Custom emojis diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md index 21c95f37aebc65..32454693d71fac 100644 --- a/doc/user/group/epics/index.md +++ b/doc/user/group/epics/index.md @@ -59,7 +59,7 @@ have a start or due date, a visual - Link [related epics](linked_epics.md) based on a type of relationship. - Create workflows with [epic boards](epic_boards.md). - [Turn on notifications](../../profile/notifications.md) for about epic events. -- [Award an emoji](../../award_emojis.md) to an epic or its comments. +- [Add an emoji reaction](../../award_emojis.md) to an epic or its comments. - Collaborate on an epic by posting comments in a [thread](../../discussions/index.md). - Use [health status](../../project/issues/managing_issues.md#health-status) to track your progress. diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 104c633229aa79..b8ed1c06324256 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -266,7 +266,7 @@ this font installed by default. -To learn more about adding custom emojis, see [Custom emoji](award_emojis.md#custom-emojis). +To learn more about adding custom emojis, see [Custom emojis](award_emojis.md#custom-emojis). ### Front matter diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index 56aa545408f3dc..a2c82fdeadf7a1 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -51,7 +51,7 @@ When deleting users, you can either: The user's personal projects are deleted, not moved to the Ghost User. - Delete the user and their contributions, including: - Abuse reports. - - Award emojis. + - Emoji reactions. - Epics. - Groups of which the user is the only user with the Owner role. - Issues. diff --git a/doc/user/project/issues/sorting_issue_lists.md b/doc/user/project/issues/sorting_issue_lists.md index a2f90d5c444d85..829e44eae9ac13 100644 --- a/doc/user/project/issues/sorting_issue_lists.md +++ b/doc/user/project/issues/sorting_issue_lists.md @@ -73,7 +73,7 @@ then issues with a milestone without a due date. ## Sorting by popularity When you sort by **Popularity**, the issue order changes to sort descending by the -number of upvotes ([awarded](../../award_emojis.md) a "thumbs up" emoji) +number of upvotes ([emoji reactions](../../award_emojis.md) with the "thumbs up") on each issue. You can use this to identify issues that are in high demand. ## Sorting by priority diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md index 3273e1c0be8932..2c52a5d743aacd 100644 --- a/doc/user/project/quick_actions.md +++ b/doc/user/project/quick_actions.md @@ -59,7 +59,7 @@ threads. Some quick actions might not be available to all subscription tiers. | `/assign me` | **{check-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** No | Assign yourself. | `/assign_reviewer @user1 @user2` or `/reviewer @user1 @user2` or `/request_review @user1 @user2` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Assign one or more users as reviewers. | `/assign_reviewer me` or `/reviewer me` or `/request_review me` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Assign yourself as a reviewer. -| `/award :emoji:` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Toggle emoji award. +| `/award :emoji:` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Toggle an emoji reaction. | `/cc @user` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Mention a user. In GitLab 15.0 and later, this command performs no action. You can instead type `CC @user` or only `@user`. [In GitLab 14.9 and earlier](https://gitlab.com/gitlab-org/gitlab/-/issues/31200), mentioning a user at the start of a line created a specific type of to-do item notification. | | `/child_epic ` | **{dotted-circle}** No | **{dotted-circle}** No | **{check-circle}** Yes | Add child epic to ``. The `` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. | `/clear_health_status` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Clear [health status](issues/managing_issues.md#health-status) ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213814) in GitLab 14.7). diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index 3ac864c1351d0b..958246908bce9a 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -160,7 +160,7 @@ For a quick overview, items that are exported include: - Issue boards - Pipelines history - Push rules -- Awards +- Emoji reactions - Group members as long as the user has the Maintainer role in the exported project's group or is an administrator diff --git a/doc/user/todos.md b/doc/user/todos.md index b05e968dd11235..8f67311b559758 100644 --- a/doc/user/todos.md +++ b/doc/user/todos.md @@ -128,7 +128,7 @@ corresponding to-do item as done. To-do items are marked as done if you: -- Add an award emoji to the description or comment. +- Add an emoji reaction to the description or comment. - Add or remove a label. - Change the assignee. - Change the milestone. -- GitLab