Automatic merge of gitlab-org/gitlab master

Gemfile

Gemfile.checksum

Gemfile.lock

...pts/ci/catalog/components/list/ci_resources_list_item.vue

app/assets/javascripts/dropzone_input.js

...sets/javascripts/emoji/queries/custom_emoji.query.graphql

app/assets/javascripts/observability/client.js

...cts/shared/permissions/components/ci_catalog_settings.vue

...phql/mutations/catalog_resources_destroy.mutation.graphql

app/assets/javascripts/vue_shared/components/awards_list.vue

...ets/javascripts/vue_shared/components/markdown/header.vue

app/assets/stylesheets/framework/header.scss

...rollers/external_redirect/external_redirect_controller.rb

app/finders/groups/custom_emoji_finder.rb

app/graphql/resolvers/custom_emoji_resolver.rb

app/graphql/types/group_type.rb

app/models/award_emoji.rb

app/models/custom_emoji.rb

app/serializers/award_emoji_entity.rb

app/validators/gitlab/emoji_name_validator.rb