summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-07-26 02:32:39 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-07-26 02:32:39 +0100
commitd61b4058efb53d52bcd2f21e012d524b76ba3d9d (patch)
tree09cf20bab9f9b68ea0beea29b55090d008d8fecd
parent6f16726ce63949191096fcf89bb2bf99647dc096 (diff)
downloadgitlab-ce-api-js-es6.tar.gz
Review changesapi-js-es6
-rw-r--r--.gitattributes3
-rw-r--r--app/assets/javascripts/api.js.es610
2 files changed, 7 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index 7e800609e6c..17cbaa5eef5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-CHANGELOG merge=union \ No newline at end of file
+CHANGELOG merge=union
+*.js.es6 gitlab-language=javascript
diff --git a/app/assets/javascripts/api.js.es6 b/app/assets/javascripts/api.js.es6
index 7997b700b83..d6b0c8c4776 100644
--- a/app/assets/javascripts/api.js.es6
+++ b/app/assets/javascripts/api.js.es6
@@ -19,7 +19,7 @@
private_token: gon.api_token
}
}).done((group) => {
- return callback(group);
+ return callback(group);
});
},
@@ -105,15 +105,15 @@
},
gitignoreText: function gitignoreText(key, callback) {
- return $.get(Api.buildUrl(Api.gitignorePath).replace(':key', key),
- (gitignore) => {
+ let url = Api.buildUrl(Api.gitignorePath).replace(':key', key);
+ return $.get(url, (gitignore) => {
return callback(gitignore);
});
},
gitlabCiYml: function gitlabCiYml(key, callback) {
- return $.get(Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key),
- (file) => {
+ let url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key);
+ return $.get(url, (file) => {
return callback(file);
});
},