summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/groups/components/app.vue
diff options
context:
space:
mode:
authorLee Tickett <lee@tickett.net>2019-09-04 03:45:28 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-09-04 03:45:28 +0000
commite8c58d62fb8da5426eed545f4182b9e85ff326ff (patch)
tree669f8db6df10c7407b6be8b9c66158f3489add6d /app/assets/javascripts/groups/components/app.vue
parentdf6f1dd93f0f427a2c66c07ea31bdb17a7efaca6 (diff)
downloadgitlab-ce-e8c58d62fb8da5426eed545f4182b9e85ff326ff.tar.gz
Remove vue resource from group service
Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/66750
Diffstat (limited to 'app/assets/javascripts/groups/components/app.vue')
-rw-r--r--app/assets/javascripts/groups/components/app.vue7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index aa50fd8ff62..8d2dac47ff2 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -95,10 +95,8 @@ export default {
if (updatePagination) {
this.updatePagination(res.headers);
}
-
- return res;
+ return res.data;
})
- .then(res => res.json())
.catch(() => {
this.isLoading = false;
$.scrollTo(0);
@@ -190,11 +188,10 @@ export default {
this.targetGroup.isBeingRemoved = true;
this.service
.leaveGroup(this.targetGroup.leavePath)
- .then(res => res.json())
.then(res => {
$.scrollTo(0);
this.store.removeGroup(this.targetGroup, this.targetParentGroup);
- Flash(res.notice, 'notice');
+ Flash(res.data.notice, 'notice');
})
.catch(err => {
let message = COMMON_STR.FAILURE;