(cherry picked from commit e3bddb62)

Conflicts:
	app/assets/javascripts/notes/components/comment_form.vue
	app/assets/javascripts/notes/components/noteable_discussion.vue
	app/assets/javascripts/notes/components/noteable_note.vue