debian-mirror-gitlab/app/assets/javascripts/merge_conflicts/merge_conflict_service.js

17 lines
399 B
JavaScript
Raw Normal View History

2018-03-17 18:26:18 +05:30
import axios from '../lib/utils/axios_utils';
2017-08-17 22:00:37 +05:30
2018-11-08 19:23:39 +05:30
export default class MergeConflictsService {
constructor(options) {
this.conflictsPath = options.conflictsPath;
this.resolveConflictsPath = options.resolveConflictsPath;
}
2016-11-03 12:29:30 +05:30
2018-11-08 19:23:39 +05:30
fetchConflictsData() {
return axios.get(this.conflictsPath);
2017-08-17 22:00:37 +05:30
}
2016-11-03 12:29:30 +05:30
2018-11-08 19:23:39 +05:30
submitResolveConflicts(data) {
return axios.post(this.resolveConflictsPath, data);
}
}