1 files changed, 31 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_service.js b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js
new file mode 100644
index 00000000000..c012b77e0bf
--- /dev/null
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js
@@ -0,0 +1,31 @@
+/* eslint-disable no-param-reassign, comma-dangle */
+
+((global) => {
+  global.mergeConflicts = global.mergeConflicts || {};
+
+  class mergeConflictsService {
+    constructor(options) {
+      this.conflictsPath = options.conflictsPath;
+      this.resolveConflictsPath = options.resolveConflictsPath;
+    }
+
+    fetchConflictsData() {
+      return $.ajax({
+        dataType: 'json',
+        url: this.conflictsPath
+      });
+    }
+
+    submitResolveConflicts(data) {
+      return $.ajax({
+        url: this.resolveConflictsPath,
+        data: JSON.stringify(data),
+        contentType: 'application/json',
+        dataType: 'json',
+        method: 'POST'
+      });
+    }
+  }
+
+  global.mergeConflicts.mergeConflictsService = mergeConflictsService;
+})(window.gl || (window.gl = {}));