diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-20 15:51:14 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-02 19:04:19 +0300 |
| commit | 314488aed71653364e3f895093c2e1087c61f1ee (patch) | |
| tree | f299c5df4640349db8b43702615d6e78df86f1f8 /app | |
| parent | a9356ceed26cd445b89dec8185d973d4897bced5 (diff) | |
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. |