Remove fetchDiscussions from notes service

2 files changed, 3 insertions, 8 deletions

diff --git a/app/assets/javascripts/notes/services/notes_service.js b/app/assets/javascripts/notes/services/notes_service.js
index 237e70c0a4c..0fcf63e691b 100644
--- a/app/assets/javascripts/notes/services/notes_service.js
+++ b/app/assets/javascripts/notes/services/notes_service.js
@@ -6,10 +6,6 @@ import * as constants from '../constants';
 Vue.use(VueResource);
 
 export default {
-  fetchDiscussions(endpoint, filter) {
-    const config = filter !== undefined ? { params: { notes_filter: filter } } : null;
-    return Vue.http.get(endpoint, config);
-  },
   deleteNote(endpoint) {
     return Vue.http.delete(endpoint);
   },
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 9054b4779aa..9ca85683987 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -46,10 +46,9 @@ export const setNotesFetchedState = ({ commit }, state) =>
 export const toggleDiscussion = ({ commit }, data) => commit(types.TOGGLE_DISCUSSION, data);
 
 export const fetchDiscussions = ({ commit, dispatch }, { path, filter }) =>
-  service
-    .fetchDiscussions(path, filter)
-    .then(res => res.json())
-    .then(discussions => {
+  axios
+    .get(path, filter !== undefined ? { params: { notes_filter: filter } } : null)
+    .then(({ data: discussions }) => {
       commit(types.SET_INITIAL_DISCUSSIONS, discussions);
       dispatch('updateResolvableDiscussionsCounts');
     });