Merge branch 'winh-missing-javascript-imports' into 'master'

app/assets/javascripts/diff_notes/components/jump_to_discussion.js

@@ -4,6 +4,8 @@
 
 import Vue from 'vue';
 
+import '../mixins/discussion';
+
 const JumpToDiscussion = Vue.extend({
   mixins: [DiscussionMixins],
   props: {

app/assets/javascripts/diff_notes/components/resolve_count.js

@@ -4,6 +4,8 @@
 
 import Vue from 'vue';
 
+import '../mixins/discussion';
+
 window.ResolveCount = Vue.extend({
   mixins: [DiscussionMixins],
   props: {

app/assets/javascripts/shortcuts.js

 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, prefer-arrow-callback, consistent-return, object-shorthand, no-unused-vars, one-var, one-var-declaration-per-line, no-else-return, comma-dangle, max-len */
 /* global Mousetrap */
 import Cookies from 'js-cookie';
+import Mousetrap from 'mousetrap';
 
 import findAndFollowLink from './shortcuts_dashboard_navigation';