summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-08-06 08:16:32 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-09-07 12:25:50 +0200
commite83114193abbb9c845e0723365f5b3a1266acccc (patch)
treedf2177b77524b70822da4756fcc24d55ff73e792 /app/assets
parent4c803ff7cf0a6b1d144d5b4b2a078a2d7f28e6be (diff)
downloadgitlab-ce-e83114193abbb9c845e0723365f5b3a1266acccc.tar.gz
Start of non getter Version
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/commons/vue.js2
-rw-r--r--app/assets/javascripts/diffs/components/parallel_diff_view.vue4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/commons/vue.js b/app/assets/javascripts/commons/vue.js
index 3b368243cc5..28f148f179c 100644
--- a/app/assets/javascripts/commons/vue.js
+++ b/app/assets/javascripts/commons/vue.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import '../vue_shared/vue_resource_interceptor';
-Vue.config.performance = true;
+// Vue.config.performance = true;
if (process.env.NODE_ENV !== 'production') {
Vue.config.productionTip = false;
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
index 24ceb52a04a..51cbddcb406 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
@@ -73,7 +73,7 @@ export default {
<table>
<tbody>
<template
- v-for="(line, index) in parallelDiffLines"
+ v-for="(line, index) in diffLines"
>
<parallel-diff-table-row
:file-hash="diffFile.fileHash"
@@ -84,7 +84,7 @@ export default {
:left-discussions="discussionsByLine(line, 'left')"
:right-discussions="discussionsByLine(line, 'right')"
/>
- <parallel-diff-comment-row
+ <!--<parallel-diff-comment-row
v-if="shouldRenderParallelCommentRow(line)"
:key="`dcr-${index}`"
:line="line"