diff options
| author | André Luís <aluis@gitlab.com> | 2018-07-31 01:51:23 +0100 |
|---|---|---|
| committer | André Luís <aluis@gitlab.com> | 2018-08-01 13:45:16 +0100 |
| commit | 09c1b008eb4b90c0a8becdf7ebb5723a8bd05468 (patch) | |
| tree | 136f242cc97e9c696b0f514f28cc5607619a45a8 /app/assets/javascripts/diffs/components/parallel_diff_view.vue | |
| parent | e3eab3661997a3a698d0763f0625add6413b4732 (diff) | |
| download | gitlab-ce-09c1b008eb4b90c0a8becdf7ebb5723a8bd05468.tar.gz | |
Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"
This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing
changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521.
Diffstat (limited to 'app/assets/javascripts/diffs/components/parallel_diff_view.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_view.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue index 8f8d6bbc818..32528c9e7ab 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue @@ -21,7 +21,8 @@ export default { }, }, computed: { - ...mapGetters('diffs', ['commitId', 'discussionsByLineCode']), + ...mapGetters('diffs', ['commitId']), + ...mapGetters(['discussionsByLineCode']), ...mapState({ diffLineCommentForms: state => state.diffs.diffLineCommentForms, }), |