Add latest changes from gitlab-org/gitlab@12-3-auto-deploy-20190916stable-branch-foss-test

1 files changed, 36 insertions, 8 deletions

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 9cc56b34c75..9cc31e26648 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -2,9 +2,10 @@
 no-unused-expressions, one-var, default-case,
 prefer-template, consistent-return, no-alert, no-return-assign,
 no-param-reassign, prefer-arrow-callback, no-else-return, vars-on-top,
-no-shadow, no-useless-escape, class-methods-use-this */
+no-unused-vars, no-shadow, no-useless-escape, class-methods-use-this */
 
 /* global ResolveService */
+/* global mrRefreshWidgetUrl */
 
 /*
 old_notes_spec.js is the spec for the legacy, jQuery notes application. It has nothing to do with the new, fancy Vue notes app.
@@ -36,6 +37,7 @@ import {
   isMetaKey,
   isInMRPage,
 } from './lib/utils/common_utils';
+import imageDiffHelper from './image_diff/helpers/index';
 import { localTimeAgo } from './lib/utils/datetime_utility';
 import { sprintf, s__, __ } from './locale';
 
@@ -681,7 +683,7 @@ export default class Notes {
     );
   }
 
-  updateNoteError() {
+  updateNoteError($parentTimeline) {
     // eslint-disable-next-line no-new
     new Flash(
       __('Your comment could not be updated! Please check your network connection and try again.'),
@@ -695,6 +697,7 @@ export default class Notes {
    */
   addDiscussionNote($form, note, isNewDiffComment) {
     if ($form.attr('data-resolve-all') != null) {
+      var projectPath = $form.data('projectPath');
       var discussionId = $form.data('discussionId');
       var mergeRequestId = $form.data('noteableIid');
 
@@ -743,6 +746,7 @@ export default class Notes {
     if (currentContent === initialContent) {
       this.removeNoteEditForm($el);
     } else {
+      var $buttons = $el.find('.note-form-actions');
       var isWidgetVisible = isInViewport($el.get(0));
 
       if (!isWidgetVisible) {
@@ -762,7 +766,7 @@ export default class Notes {
    * Replaces the note text with the note edit form
    * Adds a data attribute to the form with the original content of the note for cancellations
    */
-  showEditForm(e) {
+  showEditForm(e, scrollTo, myLastNote) {
     e.preventDefault();
 
     var $target = $(e.target);
@@ -846,11 +850,16 @@ export default class Notes {
    * Removes the whole discussion if the last note is being removed.
    */
   removeNote(e) {
-    var noteElId, $note;
+    var noteElId, noteId, dataNoteId, $note, lineHolder;
     $note = $(e.currentTarget).closest('.note');
     noteElId = $note.attr('id');
+    noteId = $note.attr('data-note-id');
+    lineHolder = $(e.currentTarget)
+      .closest('.notes[data-discussion-id]')
+      .closest('.notes_holder')
+      .prev('.line_holder');
     $(`.note[id="${noteElId}"]`).each(
-      (function() {
+      (function(_this) {
         // A same note appears in the "Discussion" and in the "Changes" tab, we have
         // to remove all. Using $('.note[id='noteId']') ensure we get all the notes,
         // where $('#noteId') would return only one.
@@ -1055,8 +1064,25 @@ export default class Notes {
     this.setupDiscussionNoteForm($link, newForm);
   }
 
-  toggleDiffNote({ target, lineType, forceShow, showReplyInput = false }) {
-    var $link, addForm, hasNotes, newForm, noteForm, replyButton, row, rowCssToAdd;
+  toggleDiffNote({
+    target,
+    lineType,
+    forceShow,
+    showReplyInput = false,
+    currentUsername,
+    currentUserAvatar,
+    currentUserFullname,
+  }) {
+    var $link,
+      addForm,
+      hasNotes,
+      newForm,
+      noteForm,
+      replyButton,
+      row,
+      rowCssToAdd,
+      targetContent,
+      isDiffCommentAvatar;
     $link = $(target);
     row = $link.closest('tr');
     const nextRow = row.next();
@@ -1489,7 +1515,7 @@ export default class Notes {
     let tempFormContent;
 
     // Identify executed quick actions from `formContent`
-    const executedCommands = availableQuickActions.filter(command => {
+    const executedCommands = availableQuickActions.filter((command, index) => {
       const commandRegex = new RegExp(`/${command.name}`);
       return commandRegex.test(formContent);
     });
@@ -1814,6 +1840,8 @@ export default class Notes {
     const $noteBody = $editingNote.find('.js-task-list-container');
     const $noteBodyText = $noteBody.find('.note-text');
     const { formData, formContent, formAction } = this.getFormData($form);
+    const $diffFile = $form.closest('.diff-file');
+    const $notesContainer = $form.closest('.notes');
 
     // Cache original comment content
     const cachedNoteBodyText = $noteBodyText.html();