From 70679dca31372419c9913b74fb006534d1a03e76 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 6 Dec 2023 16:06:39 +0000 Subject: [PATCH 1/3] Enable the custom_emoji feature flag by default --- .../development/custom_emoji.yml | 2 +- doc/api/graphql/custom_emoji.md | 4 +-- doc/user/emoji_reactions.md | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/config/feature_flags/development/custom_emoji.yml b/config/feature_flags/development/custom_emoji.yml index 64c53c29fdb85f..8644340d2e6814 100644 --- a/config/feature_flags/development/custom_emoji.yml +++ b/config/feature_flags/development/custom_emoji.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231317 milestone: '13.6' type: development group: group::project management -default_enabled: false +default_enabled: true diff --git a/doc/api/graphql/custom_emoji.md b/doc/api/graphql/custom_emoji.md index c1caf4f90b12c0..cb47c9a6281c72 100644 --- a/doc/api/graphql/custom_emoji.md +++ b/doc/api/graphql/custom_emoji.md @@ -8,10 +8,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37911) in GitLab 13.6 [with a flag](../../administration/feature_flags.md) named `custom_emoji`. Disabled by default. > - Enabled on GitLab.com in GitLab 14.0. +> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138969) in GitLab 16.7. FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../../administration/feature_flags.md) named `custom_emoji`. -On GitLab.com, this feature is available. +On self-managed GitLab, by default this feature is available. To hide the feature, an administrator can [disable the feature flag](../../administration/feature_flags.md) named `custom_emoji`. This feature is ready for production use. To use [custom emoji](../../user/emoji_reactions.md) in comments and descriptions, you can add them to a top-level group using the GraphQL API. diff --git a/doc/user/emoji_reactions.md b/doc/user/emoji_reactions.md index 1b2c1bcd2e5e5d..20b5ca5d98014d 100644 --- a/doc/user/emoji_reactions.md +++ b/doc/user/emoji_reactions.md @@ -48,8 +48,15 @@ To remove an emoji reaction, select the emoji again. > - [Introduced for GraphQL API](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37911) in GitLab 13.6 [with a flag](../administration/feature_flags.md) named `custom_emoji`. Disabled by default. > - Enabled on GitLab.com in GitLab 14.0. > - UI to add emoji [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/333095) in GitLab 16.2. +> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138969) in GitLab 16.7. + +FLAG: +On self-managed GitLab, by default this feature is available. To hide the feature, an administrator can [disable the feature flag](../administration/feature_flags.md) named `custom_emoji`. +On GitLab.com, this feature is available. +This feature is ready for production use. Custom emoji show in the emoji picker everywhere you can react with emoji. + To add an emoji reaction to a comment or description: 1. Select **Add reaction** (**{slight-smile}**). @@ -66,3 +73,21 @@ For more information, see [Use custom emoji with GraphQL](../api/graphql/custom_ For a list of custom emoji available for GitLab.com, see [the `custom_emoji` project](https://gitlab.com/custom_emoji/custom_emoji/-/tree/main/img). + +### Upload custom emoji to a group + +Upload your custom emoji to a group to use them in all its subgroups and projects. + +Prerequisites: + +- You must at least have the developer role for the group. + +To upload custom emoji: + +1. Click any award emoji button on an issue, merge request, or epic. +1. Click on `Create new emoji`. +1. Enter a name and URL for the custom emoji. +1. Click on the `Save` button. + +You can also upload custom emoji to a GitLab instance with the GraphQL API. +For more information, see [Use custom emoji with GraphQL](../api/graphql/custom_emoji.md). -- GitLab From ac09eb0f556b856e6762af5cb36af477d8d71c19 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Thu, 14 Dec 2023 12:14:32 +0000 Subject: [PATCH 2/3] Apply 1 suggestion(s) to 1 file(s) --- doc/user/emoji_reactions.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/user/emoji_reactions.md b/doc/user/emoji_reactions.md index 20b5ca5d98014d..2b3a2662177fce 100644 --- a/doc/user/emoji_reactions.md +++ b/doc/user/emoji_reactions.md @@ -84,10 +84,10 @@ Prerequisites: To upload custom emoji: -1. Click any award emoji button on an issue, merge request, or epic. -1. Click on `Create new emoji`. +1. On a description or a comment, select **Add reaction** (**{slight-smile}**). +1. At the bottom of the emoji picker, select **Create new emoji**. 1. Enter a name and URL for the custom emoji. -1. Click on the `Save` button. +1. Select **Save**. You can also upload custom emoji to a GitLab instance with the GraphQL API. For more information, see [Use custom emoji with GraphQL](../api/graphql/custom_emoji.md). -- GitLab From 78e78af7b9fc6db60c0ed8ac7ca5abd9d81a715d Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Thu, 14 Dec 2023 12:32:02 +0000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) --- doc/user/emoji_reactions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/user/emoji_reactions.md b/doc/user/emoji_reactions.md index 2b3a2662177fce..30cd052f31ca9e 100644 --- a/doc/user/emoji_reactions.md +++ b/doc/user/emoji_reactions.md @@ -76,6 +76,8 @@ For a list of custom emoji available for GitLab.com, see ### Upload custom emoji to a group +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128355) in GitLab 16.5. + Upload your custom emoji to a group to use them in all its subgroups and projects. Prerequisites: -- GitLab