Add latest changes from gitlab-org/gitlab@master

.gitlab/issue_templates/Implementation.md

@@ -39,24 +39,25 @@ Add details for required items and delete others.
 <!--
 Steps and the parts of the code that will need to get updated. The plan can also
 call-out responsibilities for other team members or teams.
--->
+
+e.g.:
 
 - [ ] ~frontend Step 1
   - [ ] `@person` Step 1a
 - [ ] ~frontend Step 2
 
+-->
+
 
 <!--
 Workflow and other relevant labels
 
-~"group::" ~"Category:" ~"GitLab Ultimate"
--->
-/label ~"workflow::refinement"
-
-<!--
+# ~"group::" ~"Category:" ~"GitLab Ultimate"
 Other settings you might want to include when creating the issue.
 
-/milestone %"Next 1-3 releases"
-/assign @
-/epic &
+# /assign @
+# /epic &
 -->
+
+/label ~"workflow::refinement"
+/milestone %Backlog

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: {