diff options
author | Mark Chao <mchao@gitlab.com> | 2018-09-28 17:54:32 +0800 |
---|---|---|
committer | Mark Chao <mchao@gitlab.com> | 2018-10-01 22:37:43 +0800 |
commit | f09303b00aa61825d2fed22aa04d8c6d1dace1b0 (patch) | |
tree | a2b02603fa479243bb45cf0821839d716ce1e0bb /app/assets/javascripts/diffs | |
parent | 39d2f186a7cceb75ee0b18a9bb21447efb5d4262 (diff) | |
download | gitlab-ce-f09303b00aa61825d2fed22aa04d8c6d1dace1b0.tar.gz |
Fix MR discussion not loaded issue51958-fix-mr-discussion-loading
Display `formatter` as the sole content of `position` object.
This means `diff_file` data is not referenced, which is the
caseu of "IOError: not opened for reading".
Diffstat (limited to 'app/assets/javascripts/diffs')
-rw-r--r-- | app/assets/javascripts/diffs/store/utils.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 631e3de311e..8c13aaa1a7e 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -244,6 +244,7 @@ export function getDiffPositionByLineCode(diffFiles) { oldLine, newLine, lineCode, + positionType: 'text', }; } }); @@ -259,8 +260,8 @@ export function isDiscussionApplicableToLine({ discussion, diffPosition, latestD const { lineCode, ...diffPositionCopy } = diffPosition; if (discussion.original_position && discussion.position) { - const originalRefs = convertObjectPropsToCamelCase(discussion.original_position.formatter); - const refs = convertObjectPropsToCamelCase(discussion.position.formatter); + const originalRefs = convertObjectPropsToCamelCase(discussion.original_position); + const refs = convertObjectPropsToCamelCase(discussion.position); return _.isEqual(refs, diffPositionCopy) || _.isEqual(originalRefs, diffPositionCopy); } |