Merge branch 'diff-notes-refactor' into 'master'

...ascripts/diff_notes/components/comment_resolve_btn.js.es6

...vascripts/diff_notes/components/jump_to_discussion.js.es6

...sets/javascripts/diff_notes/components/resolve_btn.js.es6

...ts/javascripts/diff_notes/components/resolve_count.js.es6

...ripts/diff_notes/components/resolve_discussion_btn.js.es6

app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6

app/assets/javascripts/diff_notes/services/resolve.js.es6

app/assets/javascripts/notes.js

app/views/discussions/_resolve_all.html.haml

app/views/projects/merge_requests/_show.html.haml

app/views/projects/notes/_note.html.haml