Add latest changes from gitlab-org/gitlab@master

2 files changed, 61 insertions, 84 deletions

diff --git a/app/assets/javascripts/notes/services/notes_service.js b/app/assets/javascripts/notes/services/notes_service.js
index 3d239d8cb6b..4d3dbec435f 100644
--- a/app/assets/javascripts/notes/services/notes_service.js
+++ b/app/assets/javascripts/notes/services/notes_service.js
@@ -1,31 +1,28 @@
-import Vue from 'vue';
-import VueResource from 'vue-resource';
+import axios from '~/lib/utils/axios_utils';
 import * as constants from '../constants';
 
-Vue.use(VueResource);
-
 export default {
   fetchDiscussions(endpoint, filter, persistFilter = true) {
     const config =
       filter !== undefined
         ? { params: { notes_filter: filter, persist_filter: persistFilter } }
         : null;
-    return Vue.http.get(endpoint, config);
+    return axios.get(endpoint, config);
   },
   replyToDiscussion(endpoint, data) {
-    return Vue.http.post(endpoint, data, { emulateJSON: true });
+    return axios.post(endpoint, data);
   },
   updateNote(endpoint, data) {
-    return Vue.http.put(endpoint, data, { emulateJSON: true });
+    return axios.put(endpoint, data);
   },
   createNewNote(endpoint, data) {
-    return Vue.http.post(endpoint, data, { emulateJSON: true });
+    return axios.post(endpoint, data);
   },
   toggleResolveNote(endpoint, isResolved) {
     const { RESOLVE_NOTE_METHOD_NAME, UNRESOLVE_NOTE_METHOD_NAME } = constants;
     const method = isResolved ? UNRESOLVE_NOTE_METHOD_NAME : RESOLVE_NOTE_METHOD_NAME;
 
-    return Vue.http[method](endpoint);
+    return axios[method](endpoint);
   },
   poll(data = {}) {
     const endpoint = data.notesData.notesPath;
@@ -36,9 +33,9 @@ export default {
       },
     };
 
-    return Vue.http.get(endpoint, options);
+    return axios.get(endpoint, options);
   },
   toggleIssueState(endpoint, data) {
-    return Vue.http.put(endpoint, data);
+    return axios.put(endpoint, data);
   },
 };
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 411bd585672..6c236981a24 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -47,13 +47,10 @@ export const setNotesFetchedState = ({ commit }, state) =>
 export const toggleDiscussion = ({ commit }, data) => commit(types.TOGGLE_DISCUSSION, data);
 
 export const fetchDiscussions = ({ commit, dispatch }, { path, filter, persistFilter }) =>
-  service
-    .fetchDiscussions(path, filter, persistFilter)
-    .then(res => res.json())
-    .then(discussions => {
-      commit(types.SET_INITIAL_DISCUSSIONS, discussions);
-      dispatch('updateResolvableDiscussionsCounts');
-    });
+  service.fetchDiscussions(path, filter, persistFilter).then(({ data }) => {
+    commit(types.SET_INITIAL_DISCUSSIONS, data);
+    dispatch('updateResolvableDiscussionsCounts');
+  });
 
 export const updateDiscussion = ({ commit, state }, discussion) => {
   commit(types.UPDATE_DISCUSSION, discussion);
@@ -80,13 +77,10 @@ export const deleteNote = ({ dispatch }, note) =>
   });
 
 export const updateNote = ({ commit, dispatch }, { endpoint, note }) =>
-  service
-    .updateNote(endpoint, note)
-    .then(res => res.json())
-    .then(res => {
-      commit(types.UPDATE_NOTE, res);
-      dispatch('startTaskList');
-    });
+  service.updateNote(endpoint, note).then(({ data }) => {
+    commit(types.UPDATE_NOTE, data);
+    dispatch('startTaskList');
+  });
 
 export const updateOrCreateNotes = ({ commit, state, getters, dispatch }, notes) => {
   const { notesById } = getters;
@@ -110,40 +104,37 @@ export const updateOrCreateNotes = ({ commit, state, getters, dispatch }, notes)
   });
 };
 
-export const replyToDiscussion = ({ commit, state, getters, dispatch }, { endpoint, data }) =>
-  service
-    .replyToDiscussion(endpoint, data)
-    .then(res => res.json())
-    .then(res => {
-      if (res.discussion) {
-        commit(types.UPDATE_DISCUSSION, res.discussion);
+export const replyToDiscussion = (
+  { commit, state, getters, dispatch },
+  { endpoint, data: reply },
+) =>
+  service.replyToDiscussion(endpoint, reply).then(({ data }) => {
+    if (data.discussion) {
+      commit(types.UPDATE_DISCUSSION, data.discussion);
 
-        updateOrCreateNotes({ commit, state, getters, dispatch }, res.discussion.notes);
+      updateOrCreateNotes({ commit, state, getters, dispatch }, data.discussion.notes);
 
-        dispatch('updateMergeRequestWidget');
-        dispatch('startTaskList');
-        dispatch('updateResolvableDiscussionsCounts');
-      } else {
-        commit(types.ADD_NEW_REPLY_TO_DISCUSSION, res);
-      }
+      dispatch('updateMergeRequestWidget');
+      dispatch('startTaskList');
+      dispatch('updateResolvableDiscussionsCounts');
+    } else {
+      commit(types.ADD_NEW_REPLY_TO_DISCUSSION, data);
+    }
 
-      return res;
-    });
+    return data;
+  });
 
-export const createNewNote = ({ commit, dispatch }, { endpoint, data }) =>
-  service
-    .createNewNote(endpoint, data)
-    .then(res => res.json())
-    .then(res => {
-      if (!res.errors) {
-        commit(types.ADD_NEW_NOTE, res);
-
-        dispatch('updateMergeRequestWidget');
-        dispatch('startTaskList');
-        dispatch('updateResolvableDiscussionsCounts');
-      }
-      return res;
-    });
+export const createNewNote = ({ commit, dispatch }, { endpoint, data: reply }) =>
+  service.createNewNote(endpoint, reply).then(({ data }) => {
+    if (!data.errors) {
+      commit(types.ADD_NEW_NOTE, data);
+
+      dispatch('updateMergeRequestWidget');
+      dispatch('startTaskList');
+      dispatch('updateResolvableDiscussionsCounts');
+    }
+    return data;
+  });
 
 export const removePlaceholderNotes = ({ commit }) => commit(types.REMOVE_PLACEHOLDER_NOTES);
 
@@ -165,41 +156,32 @@ export const resolveDiscussion = ({ state, dispatch, getters }, { discussionId }
 };
 
 export const toggleResolveNote = ({ commit, dispatch }, { endpoint, isResolved, discussion }) =>
-  service
-    .toggleResolveNote(endpoint, isResolved)
-    .then(res => res.json())
-    .then(res => {
-      const mutationType = discussion ? types.UPDATE_DISCUSSION : types.UPDATE_NOTE;
+  service.toggleResolveNote(endpoint, isResolved).then(({ data }) => {
+    const mutationType = discussion ? types.UPDATE_DISCUSSION : types.UPDATE_NOTE;
 
-      commit(mutationType, res);
+    commit(mutationType, data);
 
-      dispatch('updateResolvableDiscussionsCounts');
+    dispatch('updateResolvableDiscussionsCounts');
 
-      dispatch('updateMergeRequestWidget');
-    });
+    dispatch('updateMergeRequestWidget');
+  });
 
 export const closeIssue = ({ commit, dispatch, state }) => {
   dispatch('toggleStateButtonLoading', true);
-  return service
-    .toggleIssueState(state.notesData.closePath)
-    .then(res => res.json())
-    .then(data => {
-      commit(types.CLOSE_ISSUE);
-      dispatch('emitStateChangedEvent', data);
-      dispatch('toggleStateButtonLoading', false);
-    });
+  return service.toggleIssueState(state.notesData.closePath).then(({ data }) => {
+    commit(types.CLOSE_ISSUE);
+    dispatch('emitStateChangedEvent', data);
+    dispatch('toggleStateButtonLoading', false);
+  });
 };
 
 export const reopenIssue = ({ commit, dispatch, state }) => {
   dispatch('toggleStateButtonLoading', true);
-  return service
-    .toggleIssueState(state.notesData.reopenPath)
-    .then(res => res.json())
-    .then(data => {
-      commit(types.REOPEN_ISSUE);
-      dispatch('emitStateChangedEvent', data);
-      dispatch('toggleStateButtonLoading', false);
-    });
+  return service.toggleIssueState(state.notesData.reopenPath).then(({ data }) => {
+    commit(types.REOPEN_ISSUE);
+    dispatch('emitStateChangedEvent', data);
+    dispatch('toggleStateButtonLoading', false);
+  });
 };
 
 export const toggleStateButtonLoading = ({ commit }, value) =>
@@ -340,8 +322,7 @@ export const poll = ({ commit, state, getters, dispatch }) => {
     resource: service,
     method: 'poll',
     data: state,
-    successCallback: resp =>
-      resp.json().then(data => pollSuccessCallBack(data, commit, state, getters, dispatch)),
+    successCallback: ({ data }) => pollSuccessCallBack(data, commit, state, getters, dispatch),
     errorCallback: () => Flash(__('Something went wrong while fetching latest comments.')),
   });
 
@@ -376,8 +357,7 @@ export const fetchData = ({ commit, state, getters }) => {
 
   service
     .poll(requestData)
-    .then(resp => resp.json)
-    .then(data => pollSuccessCallBack(data, commit, state, getters))
+    .then(({ data }) => pollSuccessCallBack(data, commit, state, getters))
     .catch(() => Flash(__('Something went wrong while fetching latest comments.')));
 };