kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Import threaded discussions in diffs

Browse source
This commit is contained in:
Stan Hu 2018-06-28 01:49:35 -07:00
parent ea727862df
commit 5817c67014
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/gitlab/bitbucket_server_import/importer.rb
View file

@ -135,7 +135,23 @@ module Gitlab
end
inline_comments.each do |comment|
begin
parent = build_diff_note(merge_request, comment, line_code_map)
next unless parent&.persisted?
comment.comments.each do |reply|
attributes = pull_request_comment_attributes(reply)
attributes.merge!(
position: build_position(merge_request, comment),
line_code: line_code_map.fetch(reply.id)
discussion_id: parent.discussion_id,
type: 'DiffNote')
merge_request.notes.create!(attributes)
end
end
end
def build_diff_note(merge_request, comment, line_code_map)
attributes = pull_request_comment_attributes(comment)
attributes.merge!(
position: build_position(merge_request, comment),
@ -145,8 +161,7 @@ module Gitlab
merge_request.notes.create!(attributes)
rescue StandardError => e
errors << { type: :pull_request, id: comment.id, errors: e.message }
end
end
nil
end
def build_position(merge_request, pr_comment)