Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 1 deletions

diff --git a/app/assets/javascripts/notes/mixins/diff_line_note_form.js b/app/assets/javascripts/notes/mixins/diff_line_note_form.js
index 0509ff24959..20ffcda282a 100644
--- a/app/assets/javascripts/notes/mixins/diff_line_note_form.js
+++ b/app/assets/javascripts/notes/mixins/diff_line_note_form.js
@@ -15,7 +15,7 @@ export default {
     }),
     ...mapGetters('diffs', ['getDiffFileByHash']),
     ...mapGetters('batchComments', ['shouldRenderDraftRowInDiscussion', 'draftForDiscussion']),
-    ...mapState('diffs', ['commit']),
+    ...mapState('diffs', ['commit', 'showWhitespace']),
   },
   methods: {
     ...mapActions('diffs', ['cancelCommentForm']),
@@ -67,6 +67,7 @@ export default {
         positionType,
         ...this.diffFileCommentForm,
         lineRange,
+        showWhitespace: this.showWhitespace,
       });
 
       const diffFileHeadSha = this.commit && this?.diffFile?.diff_refs?.head_sha;