diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-25 14:02:09 +0200 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-28 12:17:02 +0200 |
commit | b452bdead4f217b7488f13db9b608a9ddce1830e (patch) | |
tree | 412aa5b7de7372fc28addfe31edff1fe6a07eec0 /app/assets/javascripts/ide/services | |
parent | f62359c23b86bb8c8dc241ff4e09bab24e74ccbd (diff) | |
download | gitlab-ce-b452bdead4f217b7488f13db9b608a9ddce1830e.tar.gz |
Actual MR diff displayed
Diffstat (limited to 'app/assets/javascripts/ide/services')
-rw-r--r-- | app/assets/javascripts/ide/services/index.js | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js index 46a65c583e0..b86a20e6abf 100644 --- a/app/assets/javascripts/ide/services/index.js +++ b/app/assets/javascripts/ide/services/index.js @@ -1,6 +1,7 @@ import Vue from 'vue'; import VueResource from 'vue-resource'; import Api from '~/api'; +import { version } from 'punycode'; Vue.use(VueResource); @@ -24,6 +25,21 @@ export default { .get(file.rawPath, { params: { format: 'json' } }) .then(res => res.text()); }, + getBaseRawFileData(file, sha) { + if (file.tempFile) { + return Promise.resolve(file.baseRaw); + } + + if (file.baseRaw) { + return Promise.resolve(file.baseRaw); + } + + return Vue.http + .get(file.rawPath.replace(file.branchId, sha), { + params: { format: 'json' }, + }) + .then(res => res.text()); + }, getProjectData(namespace, project) { return Api.project(`${namespace}/${project}`); }, @@ -33,6 +49,12 @@ export default { getProjectMergeRequestChanges(projectId, mergeRequestId) { return Api.mergeRequestChanges(projectId, mergeRequestId); }, + getProjectMergeRequestVersions(projectId, mergeRequestId) { + return Api.mergeRequestVersions(projectId, mergeRequestId); + }, + getProjectMergeRequestVersion(projectId, mergeRequestId, versionId) { + return Api.mergeRequestVersion(projectId, mergeRequestId, versionId); + }, getBranchData(projectId, currentBranchId) { return Api.branchSingle(projectId, currentBranchId); }, |