Merge branch 'approval-integration' of gitlab.com:gitlab-org/gitlab-ee into approval-integration

config/application.rb

@@ -95,7 +95,7 @@ module Gitlab
     config.assets.precompile << "profile/profile_bundle.js"
     config.assets.precompile << "protected_branches/protected_branches_bundle.js"
     config.assets.precompile << "diff_notes/diff_notes_bundle.js"
-    config.assets.precompile << "generic_bundles/vue_resource.js"
+    config.assets.precompile << "lib/vue_resource.js"
     config.assets.precompile << "merge_request_widget/widget_bundle.js"
     config.assets.precompile << "issuable/issuable_bundle.js"
     config.assets.precompile << "boards/boards_bundle.js"

spec/javascripts/vue_common_components/link_to_member_avatar_spec.js.es6

@@ -51,13 +51,13 @@
 
       it('should correctly compute computed values', function(done) {
         const correctVals = {
-          'disabledClass': '',
-          'avatarSizeClass': 's32',
-          'avatarHtmlClass': 's32 avatar avatar-inline',
-          'avatarClass': 'avatar avatar-inline s32 ',
-          'tooltipClass': 'has-tooltip',
-          'linkClass': 'author_link has-tooltip  ',
-          'tooltipContainerAttr': 'body',
+          disabledClass: '',
+          avatarSizeClass: 's32',
+          avatarHtmlClass: 's32 avatar avatar-inline',
+          avatarClass: 'avatar avatar-inline s32 ',
+          tooltipClass: 'has-tooltip',
+          linkClass: 'author_link has-tooltip  ',
+          tooltipContainerAttr: 'body',
         };
 
         Vue.nextTick(() => {