From a1fc04dfad84822d0e26e60ac109f83d42d5403a Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 3 Nov 2016 15:53:54 +0300 Subject: VueJSMigration: Remove parallel-conflict-line component. It's because Vue says: "Component template should contain exactly one root element". --- .../components/parallel_conflict_line.js.es6 | 15 --------------- .../components/parallel_conflict_lines.js.es6 | 5 +---- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6 (limited to 'app/assets/javascripts/merge_conflicts') diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6 b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6 deleted file mode 100644 index 797850262cc..00000000000 --- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6 +++ /dev/null @@ -1,15 +0,0 @@ -/* eslint-disable */ -((global) => { - - global.mergeConflicts = global.mergeConflicts || {}; - - global.mergeConflicts.parallelConflictLine = Vue.extend({ - props: { - file: Object, - line: Object - }, - mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions], - template: '#parallel-conflict-line' - }); - -})(window.gl || (window.gl = {})); diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 index 1b3e9901f1e..083a836f92f 100644 --- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 +++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 @@ -7,10 +7,7 @@ props: { file: Object }, - mixins: [global.mergeConflicts.utils], - components: { - 'parallel-conflict-line': gl.mergeConflicts.parallelConflictLine - } + mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions] }); })(window.gl || (window.gl = {})); -- cgit v1.2.1