From 5b13bc3b9401d77d0d4625020eb83c18124415a0 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Thu, 6 Apr 2017 22:01:23 -0400 Subject: [PATCH] Update json() refs to body with Vue Resource bump. --- app/assets/javascripts/blob/notebook/index.js | 2 +- app/assets/javascripts/boards/boards_bundle.js | 4 ++-- .../javascripts/boards/components/board_blank_state.js | 2 +- app/assets/javascripts/boards/components/boards_selector.js | 2 +- app/assets/javascripts/boards/components/modal/index.js | 2 +- app/assets/javascripts/boards/models/list.js | 6 +++--- app/assets/javascripts/boards/services/board_service.js | 2 +- app/assets/javascripts/commit/pipelines/pipelines_table.js | 2 +- app/assets/javascripts/diff_notes/components/resolve_btn.js | 2 +- app/assets/javascripts/diff_notes/services/resolve.js | 2 +- .../environments/components/deploy_board_component.js | 2 +- .../javascripts/environments/components/environment.js | 6 +++--- .../environments/folder/environments_folder_view.js | 2 +- app/assets/javascripts/vue_pipelines_index/pipelines.js | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/blob/notebook/index.js b/app/assets/javascripts/blob/notebook/index.js index 9b8bfbfc8c0002..0a26fc05ad3ed4 100644 --- a/app/assets/javascripts/blob/notebook/index.js +++ b/app/assets/javascripts/blob/notebook/index.js @@ -50,7 +50,7 @@ export default () => { loadFile() { this.$http.get(el.dataset.endpoint) .then((res) => { - this.json = res.json(); + this.json = res.body; this.loading = false; }) .catch((e) => { diff --git a/app/assets/javascripts/boards/boards_bundle.js b/app/assets/javascripts/boards/boards_bundle.js index 111b4aa46dd0ab..80498f0a817d15 100644 --- a/app/assets/javascripts/boards/boards_bundle.js +++ b/app/assets/javascripts/boards/boards_bundle.js @@ -91,8 +91,8 @@ $(() => { mounted () { Store.disabled = this.disabled; gl.boardService.all() - .then((resp) => { - resp.json().forEach((board) => { + .then((body=> { + resp.body.forEach((board) => { const list = Store.addList(board); if (list.type === 'closed') { diff --git a/app/assets/javascripts/boards/components/board_blank_state.js b/app/assets/javascripts/boards/components/board_blank_state.js index 3fc68457961022..2c6a7c3b43cf12 100644 --- a/app/assets/javascripts/boards/components/board_blank_state.js +++ b/app/assets/javascripts/boards/components/board_blank_state.js @@ -65,7 +65,7 @@ export default { // Save the labels gl.boardService.generateDefaultLists() .then((resp) => { - resp.json().forEach((listObj) => { + resp.body.forEach((listObj) => { const list = Store.findList('title', listObj.title); list.id = listObj.id; diff --git a/app/assets/javascripts/boards/components/boards_selector.js b/app/assets/javascripts/boards/components/boards_selector.js index c6d0e220eff512..b278c74209ef20 100644 --- a/app/assets/javascripts/boards/components/boards_selector.js +++ b/app/assets/javascripts/boards/components/boards_selector.js @@ -86,7 +86,7 @@ require('./board_new_form'); if (this.open && !this.boards.length) { gl.boardService.allBoards().then((resp) => { this.loading = false; - this.boards = resp.json(); + this.boards = resp.body; }); } }, diff --git a/app/assets/javascripts/boards/components/modal/index.js b/app/assets/javascripts/boards/components/modal/index.js index 91c08cde13a929..ae00d59f5a7d44 100644 --- a/app/assets/javascripts/boards/components/modal/index.js +++ b/app/assets/javascripts/boards/components/modal/index.js @@ -86,7 +86,7 @@ require('./empty_state'); page: this.page, per: this.perPage, })).then((res) => { - const data = res.json(); + const data = res.body; if (clearIssues) { this.issues = []; diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js index 93131a073c718b..a45fab9b8059a0 100644 --- a/app/assets/javascripts/boards/models/list.js +++ b/app/assets/javascripts/boards/models/list.js @@ -34,7 +34,7 @@ class List { save () { return gl.boardService.createList(this.label.id) .then((resp) => { - const data = resp.json(); + const data = resp.body; this.id = data.id; this.type = data.list_type; @@ -77,7 +77,7 @@ class List { return gl.boardService.getIssuesForList(this.id, data) .then((resp) => { - const data = resp.json(); + const data = resp.body; this.loading = false; this.issuesSize = data.size; @@ -95,7 +95,7 @@ class List { return gl.boardService.newIssue(this.id, issue) .then((resp) => { - const data = resp.json(); + const data = resp.body; issue.id = data.iid; issue.milestone = data.milestone; }); diff --git a/app/assets/javascripts/boards/services/board_service.js b/app/assets/javascripts/boards/services/board_service.js index 32ff516377634f..08f5bf0144b51a 100644 --- a/app/assets/javascripts/boards/services/board_service.js +++ b/app/assets/javascripts/boards/services/board_service.js @@ -110,7 +110,7 @@ class BoardService { return this.$http.get(this.milestonePath) .then((res) => { - this.milestones = res.json(); + this.milestones = res.body; this.loading = false; }); } diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js b/app/assets/javascripts/commit/pipelines/pipelines_table.js index 4d5a857d70560f..2eeda15120ca05 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js @@ -87,7 +87,7 @@ export default Vue.component('pipelines-table', { fetchPipelines() { this.isLoading = true; return this.service.getPipelines() - .then(response => response.json()) + .then(response => response.body) .then((json) => { // depending of the endpoint the response can either bring a `pipelines` key or not. const pipelines = json.pipelines || json; diff --git a/app/assets/javascripts/diff_notes/components/resolve_btn.js b/app/assets/javascripts/diff_notes/components/resolve_btn.js index 312f38ce241e28..7f6e9b70ea3a0b 100644 --- a/app/assets/javascripts/diff_notes/components/resolve_btn.js +++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js @@ -80,7 +80,7 @@ import Vue from 'vue'; this.loading = false; if (response.status === 200) { - const data = response.json(); + const data = response.body; const resolved_by = data ? data.resolved_by : null; CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, resolved_by); diff --git a/app/assets/javascripts/diff_notes/services/resolve.js b/app/assets/javascripts/diff_notes/services/resolve.js index bfa4fc9037a202..1f443295061101 100644 --- a/app/assets/javascripts/diff_notes/services/resolve.js +++ b/app/assets/javascripts/diff_notes/services/resolve.js @@ -41,7 +41,7 @@ Vue.use(VueResource); discussion.loading = false; if (response.status === 200) { - const data = response.json(); + const data = response.body; const resolved_by = data ? data.resolved_by : null; if (isResolved) { diff --git a/app/assets/javascripts/environments/components/deploy_board_component.js b/app/assets/javascripts/environments/components/deploy_board_component.js index ad07ffc54c93b8..788518c41840c8 100644 --- a/app/assets/javascripts/environments/components/deploy_board_component.js +++ b/app/assets/javascripts/environments/components/deploy_board_component.js @@ -95,7 +95,7 @@ export default { return resp; } - return resp.json(); + return resp.body; }) .then((response) => { this.store.storeDeployBoard(this.environmentID, response); diff --git a/app/assets/javascripts/environments/components/environment.js b/app/assets/javascripts/environments/components/environment.js index 68379e0e3d717a..a51559dffe3374 100644 --- a/app/assets/javascripts/environments/components/environment.js +++ b/app/assets/javascripts/environments/components/environment.js @@ -119,7 +119,7 @@ export default Vue.component('environment-component', { gl.utils.visitUrl(param); return param; - }, + },body fetchEnvironments() { const scope = gl.utils.getParameterByName('scope') || this.visibility; @@ -130,7 +130,7 @@ export default Vue.component('environment-component', { return this.service.get(scope, pageNumber) .then(resp => ({ headers: resp.headers, - body: resp.json(), + body: resp.body, })) .then((response) => { this.store.storeAvailableCount(response.body.available_count); @@ -151,7 +151,7 @@ export default Vue.component('environment-component', { this.isLoadingFolderContent = true; this.service.getFolderContent(folderUrl) - .then(resp => resp.json()) + .then(resp => resp.body) .then((response) => { this.store.setfolderContent(folder, response.environments); this.isLoadingFolderContent = false; diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js b/app/assets/javascripts/environments/folder/environments_folder_view.js index c359bce943c86e..b20d4d1d7e330c 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_view.js +++ b/app/assets/javascripts/environments/folder/environments_folder_view.js @@ -93,7 +93,7 @@ export default Vue.component('environment-folder-view', { return this.service.get() .then(resp => ({ headers: resp.headers, - body: resp.json(), + body: resp.body, })) .then((response) => { this.store.storeAvailableCount(response.body.available_count); diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js b/app/assets/javascripts/vue_pipelines_index/pipelines.js index 9bdc232b7da2e7..226823ae4ea759 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipelines.js +++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js @@ -161,7 +161,7 @@ export default { return this.service.getPipelines(scope, pageNumber) .then(resp => ({ headers: resp.headers, - body: resp.json(), + body: resp.body, })) .then((response) => { this.store.storeCount(response.body.count); -- GitLab