diff options
-rw-r--r-- | app/assets/javascripts/commons/vue.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/store/actions.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/commons/vue.js b/app/assets/javascripts/commons/vue.js index 3b368243cc5..798623b94fb 100644 --- a/app/assets/javascripts/commons/vue.js +++ b/app/assets/javascripts/commons/vue.js @@ -1,8 +1,6 @@ import Vue from 'vue'; import '../vue_shared/vue_resource_interceptor'; -Vue.config.performance = true; - if (process.env.NODE_ENV !== 'production') { Vue.config.productionTip = false; } diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 2db08ebf728..365cf61d5eb 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -42,7 +42,11 @@ export const assignDiscussionsToDiff = ({ state }, allLineDiscussions) => { ); if (targetLine) { - Object.assign(targetLine.right, { discussions }); + if (targetLine.left && targetLine.left.lineCode === discussions[0].line_code) { + Object.assign(targetLine.left, { discussions }); + } else { + Object.assign(targetLine.right, { discussions }); + } } const targetInlineLine = selectedFile.highlightedDiffLines.find( |