summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/api.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 18:06:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 18:06:57 +0000
commit6d31b8f052d30b7e55128d17b66bceed8c6065a9 (patch)
treeca428cf6145af7cfaada94378e66bd5e7cc5a429 /app/assets/javascripts/api.js
parent69944ffb68788d190e81ff7e33db5dcb6c903184 (diff)
downloadgitlab-ce-6d31b8f052d30b7e55128d17b66bceed8c6065a9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/api.js')
-rw-r--r--app/assets/javascripts/api.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index 735cbb8e356..aee9990bc0b 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -113,10 +113,9 @@ const Api = {
.get(url, {
params: Object.assign(defaults, options),
})
- .then(({ data }) => {
+ .then(({ data, headers }) => {
callback(data);
-
- return data;
+ return { data, headers };
});
},