summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 06:07:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 06:07:47 +0000
commitd2b64c37bdef067656fdc8deb4728a2fbc6c2729 (patch)
tree5cab5936f9c176f81d9749baf4ccbdcf94be9e64 /app/assets/javascripts/notes
parent4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (diff)
downloadgitlab-ce-d2b64c37bdef067656fdc8deb4728a2fbc6c2729.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r--app/assets/javascripts/notes/stores/mutations.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index 028fc87198c..dab09d1d05c 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -169,7 +169,7 @@ export default {
const { id, name, username } = state.userData;
const hasEmojiAwardedByCurrentUser = note.award_emoji.filter(
- emoji => emoji.name === data.awardName && emoji.user.id === id,
+ emoji => `${emoji.name}` === `${data.awardName}` && emoji.user.id === id,
);
if (hasEmojiAwardedByCurrentUser.length) {