Add latest changes from gitlab-org/gitlab@master

4 files changed, 34 insertions, 39 deletions

diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index 3158e086f6c..e4f09492d9c 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -101,6 +101,7 @@ export default {
           <time-ago-tooltip :time="createdAt" tooltip-placement="bottom" />
         </a>
       </template>
+      <slot name="extra-controls"></slot>
       <i
         class="fa fa-spinner fa-spin editing-spinner"
         :aria-label="__('Comment is being updated')"
diff --git a/app/assets/javascripts/notes/mixins/description_version_history.js b/app/assets/javascripts/notes/mixins/description_version_history.js
new file mode 100644
index 00000000000..12d80f3faa2
--- /dev/null
+++ b/app/assets/javascripts/notes/mixins/description_version_history.js
@@ -0,0 +1,12 @@
+// Placeholder for GitLab FOSS
+// Actual implementation: ee/app/assets/javascripts/notes/mixins/description_version_history.js
+export default {
+  computed: {
+    canSeeDescriptionVersion() {},
+    shouldShowDescriptionVersion() {},
+    descriptionVersionToggleIcon() {},
+  },
+  methods: {
+    toggleDescriptionVersion() {},
+  },
+};
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 004035ea1d4..82c291379ec 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -12,6 +12,7 @@ import service from '../services/notes_service';
 import loadAwardsHandler from '../../awards_handler';
 import sidebarTimeTrackingEventHub from '../../sidebar/event_hub';
 import { isInViewport, scrollToElement, isInMRPage } from '../../lib/utils/common_utils';
+import { mergeUrlParams } from '../../lib/utils/url_utility';
 import mrWidgetEventHub from '../../vue_merge_request_widget/event_hub';
 import { __ } from '~/locale';
 import Api from '~/api';
@@ -475,5 +476,20 @@ export const convertToDiscussion = ({ commit }, noteId) =>
 export const removeConvertedDiscussion = ({ commit }, noteId) =>
   commit(types.REMOVE_CONVERTED_DISCUSSION, noteId);
 
+export const fetchDescriptionVersion = (_, { endpoint, startingVersion }) => {
+  let requestUrl = endpoint;
+
+  if (startingVersion) {
+    requestUrl = mergeUrlParams({ start_version_id: startingVersion }, requestUrl);
+  }
+
+  return axios
+    .get(requestUrl)
+    .then(res => res.data)
+    .catch(() => {
+      Flash(__('Something went wrong while fetching description changes. Please try again.'));
+    });
+};
+
 // prevent babel-plugin-rewire from generating an invalid default during karma tests
 export default () => {};
diff --git a/app/assets/javascripts/notes/stores/collapse_utils.js b/app/assets/javascripts/notes/stores/collapse_utils.js
index bee6d4f0329..3cdcc7a05b8 100644
--- a/app/assets/javascripts/notes/stores/collapse_utils.js
+++ b/app/assets/javascripts/notes/stores/collapse_utils.js
@@ -1,34 +1,9 @@
-import { n__, s__, sprintf } from '~/locale';
 import { DESCRIPTION_TYPE } from '../constants';
 
 /**
- * Changes the description from a note, returns 'changed the description n number of times'
- */
-export const changeDescriptionNote = (note, descriptionChangedTimes, timeDifferenceMinutes) => {
-  const descriptionNote = Object.assign({}, note);
-
-  descriptionNote.note_html = sprintf(
-    s__(`MergeRequest|
-  %{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}`),
-    {
-      paragraphStart: '<p dir="auto">',
-      paragraphEnd: '</p>',
-      descriptionChangedTimes,
-      timeDifferenceMinutes: n__('within %d minute ', 'within %d minutes ', timeDifferenceMinutes),
-    },
-    false,
-  );
-
-  descriptionNote.times_updated = descriptionChangedTimes;
-
-  return descriptionNote;
-};
-
-/**
  * Checks the time difference between two notes from their 'created_at' dates
  * returns an integer
  */
-
 export const getTimeDifferenceMinutes = (noteBeggining, noteEnd) => {
   const descriptionNoteBegin = new Date(noteBeggining.created_at);
   const descriptionNoteEnd = new Date(noteEnd.created_at);
@@ -57,7 +32,6 @@ export const isDescriptionSystemNote = note => note.system && note.note === DESC
 export const collapseSystemNotes = notes => {
   let lastDescriptionSystemNote = null;
   let lastDescriptionSystemNoteIndex = -1;
-  let descriptionChangedTimes = 1;
 
   return notes.slice(0).reduce((acc, currentNote) => {
     const note = currentNote.notes[0];
@@ -70,32 +44,24 @@ export const collapseSystemNotes = notes => {
       } else if (lastDescriptionSystemNote) {
         const timeDifferenceMinutes = getTimeDifferenceMinutes(lastDescriptionSystemNote, note);
 
-        // are they less than 10 minutes apart?
-        if (timeDifferenceMinutes > 10) {
-          // reset counter
-          descriptionChangedTimes = 1;
+        // are they less than 10 minutes apart from the same user?
+        if (timeDifferenceMinutes > 10 || note.author.id !== lastDescriptionSystemNote.author.id) {
           // update the previous system note
           lastDescriptionSystemNote = note;
           lastDescriptionSystemNoteIndex = acc.length;
         } else {
-          // increase counter
-          descriptionChangedTimes += 1;
+          // set the first version to fetch grouped system note versions
+          note.start_description_version_id = lastDescriptionSystemNote.description_version_id;
 
           // delete the previous one
           acc.splice(lastDescriptionSystemNoteIndex, 1);
 
-          // replace the text of the current system note with the collapsed note.
-          currentNote.notes.splice(
-            0,
-            1,
-            changeDescriptionNote(note, descriptionChangedTimes, timeDifferenceMinutes),
-          );
-
           // update the previous system note index
           lastDescriptionSystemNoteIndex = acc.length;
         }
       }
     }
+
     acc.push(currentNote);
     return acc;
   }, []);