diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-01 09:07:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-01 09:07:32 +0300 |
| commit | 916bb1bb577b64ec769b4c081c4f861a2f47322f (patch) | |
| tree | 5184da3dd62647179130811c75de9631c925300d /app/assets/javascripts | |
| parent | a3e0d4c59ff43ee406d2fee12a29339b95a0787d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/emoji/queries/custom_emoji.query.graphql | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/awards_list.vue | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/emoji/queries/custom_emoji.query.graphql b/app/assets/javascripts/emoji/queries/custom_emoji.query.graphql index ba3911ab091..951027ec274 100644 --- a/app/assets/javascripts/emoji/queries/custom_emoji.query.graphql +++ b/app/assets/javascripts/emoji/queries/custom_emoji.query.graphql @@ -1,7 +1,7 @@ query getCustomEmoji($groupPath: ID!) { group(fullPath: $groupPath) { id - customEmoji(includeAncestorGroups: true) { + customEmoji { nodes { id name diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue index 3c19df9c196..59f03b41144 100644 --- a/app/assets/javascripts/vue_shared/components/awards_list.vue +++ b/app/assets/javascripts/vue_shared/components/awards_list.vue @@ -94,12 +94,14 @@ export default { return awardList.some((award) => award.user.id === this.currentUserId); }, createAwardList(name, list) { + const url = list.length ? list[0].url : null; + return { name, list, title: this.getAwardListTitle(list, name), classes: this.getAwardClassBindings(list), - html: glEmojiTag(name), + html: glEmojiTag(name, { url }), }; }, getAwardListTitle(awardsList, name) { |