summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-10-18 09:29:51 +0000
committerLin Jen-Shin <godfat@godfat.org>2016-10-18 09:29:51 +0000
commitb3d401adcd02bcb351fe23c33e5bb4863e77bcd4 (patch)
treece46c9909a58006aa027b8da5671af163e18486f /app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6
parent88328c5729182bf6289b5f34ed3eb2a23098df25 (diff)
parent4e6af0c3fa335d138343dce3e0216303a9b1cd79 (diff)
downloadgitlab-ce-retry-cancelled-pipelines.tar.gz
Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelines
* upstream/master: (58 commits) Update endpoint to username validator change border color to variable Add todo for deprecated user routes and more information about deprecation to changelog Provide better error message to the user Apply better hierarchy to markdown headers and issue/mr titles Swapped button text manipulation outcomes for the toggle query Fixed find file keyboard navigation Update CHANGELOG for 8.12.7 Added download-button class and applied button margin Enable activerecord_sane_schema_dumper for test Updated logo from @luke Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 Fix Test Env (proper error handling when gitlab-shell is not clonned) Fix randomly crashing spinach test for merge request [Great spinach fix] Replace gsub with delete Remove carriage returns from commit description as summary is on a newline and will always include carriage returns Convert due_date_select.js filetype to es6. Stop directly parsing due_date with Date.parse, prefer parsing implicitly. Improve spec for pipeline metrics worker Add Pipeline metrics worker ...
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6')
-rw-r--r--app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es614
1 files changed, 14 insertions, 0 deletions
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
new file mode 100644
index 00000000000..8b0a8ab2073
--- /dev/null
+++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6
@@ -0,0 +1,14 @@
+((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 = {}));