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

app/assets/javascripts/merge_request_widget/approvals/approvals_store.js.es6

@@ -31,7 +31,7 @@
             this.assignToRootStore('showApprovals', true);
           })
           .catch((err) => {
-            console.error(`Failed to initialize approvals store: ${err}`);
+            console.error('Failed to initialize approvals store', err);
           });
       }
       return Promise.resolve();

app/services/notification_service.rb

@@ -163,7 +163,7 @@ class NotificationService
   end
 
   def unapprove_mr(merge_request, current_user)
-    warn 'TODO: send unapproval email'
+    # TODO: send unapproval email
   end
 
   def resolve_all_discussions(merge_request, current_user)