diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-17 12:09:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-17 12:09:18 +0000 |
| commit | f1e6e8d0daf795af777270cab39355b45794f528 (patch) | |
| tree | 6ecae41a301e9b6b1b1264980a0d9e362cb2ec03 /app/assets/javascripts/notes | |
| parent | 47bf113937a3c98bc2856f0db6e0a07ecdb9ea76 (diff) | |
| download | gitlab-ce-f1e6e8d0daf795af777270cab39355b45794f528.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index a2f5f69efb4..24399e669a6 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -125,9 +125,11 @@ export default { type: Boolean, required: true, }, + // This can be undefined when `canAwardEmoji` is false awardPath: { type: String, - required: true, + required: false, + default: '', }, }, computed: { |