summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflict_service.js
blob: 64d691592225f27a0c840b4c1458c4e25a4c039d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
import axios from '../lib/utils/axios_utils';

export default class MergeConflictsService {
  constructor(options) {
    this.conflictsPath = options.conflictsPath;
    this.resolveConflictsPath = options.resolveConflictsPath;
  }

  fetchConflictsData() {
    return axios.get(this.conflictsPath);
  }

  submitResolveConflicts(data) {
    return axios.post(this.resolveConflictsPath, data);
  }
}