diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-20 12:51:14 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-09-20 12:51:14 +0000 |
| commit | ac3157a0d5c3cd32ebc68c0f29e48d7a9c64edc5 (patch) | |
| tree | 09f9f2825528b5d656a8f77c8ae45b20d4687a82 /app | |
| parent | 8c2192943a5efc4d0a28c67b04bf9b979def66a1 (diff) | |
| parent | 305ce57094b5ed38c27a3e8cb84b35c1d871d383 (diff) | |
| download | gitlab-ce-ac3157a0d5c3cd32ebc68c0f29e48d7a9c64edc5.tar.gz | |
Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'
Fixed hidden truncated diff lines not showing when expanded
See merge request gitlab-org/gitlab-ce!21801
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes/stores/mutations.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index 16bb54be126..f1242a0d8be 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -100,7 +100,10 @@ export default { discussionsData.forEach(discussion => { if (discussion.diff_file) { - Object.assign(discussion, { fileHash: discussion.diff_file.file_hash }); + Object.assign(discussion, { + fileHash: discussion.diff_file.file_hash, + truncated_diff_lines: discussion.truncated_diff_lines || [], + }); } // To support legacy notes, should be very rare case. |