summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-08-09 09:24:48 -0400
committerMike Greiling <mike@pixelcog.com>2017-08-17 15:55:23 -0500
commit725a4fef5aeea02bea3f943133d075177424117d (patch)
tree350aa2807516dba9b32738acd312062345f226ce
parent91d3e6d9011edd19f980a8a0864ff0f673513011 (diff)
downloadgitlab-ce-725a4fef5aeea02bea3f943133d075177424117d.tar.gz
Add thenable ajax calls.
-rw-r--r--app/assets/javascripts/api.js6
-rw-r--r--app/assets/javascripts/repo/components/repo_commit_section.vue5
-rw-r--r--app/assets/javascripts/repo/services/repo_service.js6
3 files changed, 8 insertions, 9 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index 56f91e95bb9..28119362455 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -99,15 +99,13 @@ const Api = {
commitMultiple(id, data, callback) {
const url = Api.buildUrl(Api.commitPath)
.replace(':id', id);
- return $.ajax({
+ return this.wrapAjaxCall({
url,
type: 'POST',
contentType: 'application/json; charset=utf-8',
data: JSON.stringify(data),
dataType: 'json',
- })
- .done(commitData => callback(commitData))
- .fail(message => callback(message.responseJSON));
+ });
},
// Return text for a specific license
diff --git a/app/assets/javascripts/repo/components/repo_commit_section.vue b/app/assets/javascripts/repo/components/repo_commit_section.vue
index 5ec4a9b6593..d06cdf2cbc2 100644
--- a/app/assets/javascripts/repo/components/repo_commit_section.vue
+++ b/app/assets/javascripts/repo/components/repo_commit_section.vue
@@ -42,10 +42,11 @@ export default {
actions,
};
Store.submitCommitsLoading = true;
- Service.commitFiles(payload, this.resetCommitState);
+ Service.commitFiles(payload)
+ .then(this.resetCommitState);
},
- resetCommitState() {
+ resetCommitState(data) {
this.submitCommitsLoading = false;
this.changedFiles = [];
this.commitMessage = '';
diff --git a/app/assets/javascripts/repo/services/repo_service.js b/app/assets/javascripts/repo/services/repo_service.js
index 3cf204e6ec8..310c03fc019 100644
--- a/app/assets/javascripts/repo/services/repo_service.js
+++ b/app/assets/javascripts/repo/services/repo_service.js
@@ -65,14 +65,14 @@ const RepoService = {
return urlArray.join('/');
},
- commitFiles(payload, cb) {
- Api.commitMultiple(Store.projectId, payload, (data) => {
+ commitFiles(payload) {
+ return Api.commitMultiple(Store.projectId, payload)
+ .then((data) => {
if (data.short_id && data.stats) {
Flash(`Your changes have been committed. Commit ${data.short_id} with ${data.stats.additions} additions, ${data.stats.deletions} deletions.`, 'notice');
} else {
Flash(data.message);
}
- cb();
});
},
};