Give some context on threaded discussions

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index 339b15ab13a..74ae6bc1ba5 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -293,9 +293,17 @@ module Gitlab
       end
 
       def pull_request_comment_attributes(comment)
+        note =
+          # Provide some context for replying
+          if comment.parent_comment
+            "> #{comment.parent_comment.note.truncate(80)}\n\n#{comment.note}"
+          else
+            comment.note
+          end
+
         {
           project: project,
-          note: comment.note,
+          note: note,
           author_id: gitlab_user_id(comment.author_email),
           created_at: comment.created_at,
           updated_at: comment.updated_at