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/notes | |
| 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/notes')
| -rw-r--r-- | app/assets/javascripts/notes/stores/getters.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index d4babf1fab2..75832884711 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -126,8 +126,8 @@ export const unresolvedDiscussionsIdsByDiff = (state, getters) => const filenameComparison = a.diff_file.file_path.localeCompare(b.diff_file.file_path); // Get the line numbers, to compare within the same file - const aLines = [a.position.formatter.new_line, a.position.formatter.old_line]; - const bLines = [b.position.formatter.new_line, b.position.formatter.old_line]; + const aLines = [a.position.new_line, a.position.old_line]; + const bLines = [b.position.new_line, b.position.old_line]; return filenameComparison < 0 || (filenameComparison === 0 && |