summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js')
-rw-r--r--app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js
new file mode 100644
index 00000000000..53e000d7e9e
--- /dev/null
+++ b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js
@@ -0,0 +1,13 @@
+/* eslint-disable no-param-reassign, comma-dangle */
+
+((global) => {
+ global.mergeConflicts = global.mergeConflicts || {};
+
+ global.mergeConflicts.actions = {
+ methods: {
+ handleSelected(file, sectionId, selection) {
+ gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection);
+ }
+ }
+ };
+})(window.gl || (window.gl = {}));