Unverified Commit 6e23d642 authored by Douwe Maan's avatar Douwe Maan Committed by Tomasz Maczukin

Merge branch 'gh-fix-comments-on-diff'

parent 212ebdfb
......@@ -4,6 +4,7 @@ v 8.8.5
- Import GitHub repositories respecting the API rate limit
- Fix todos page throwing errors when you have a project pending deletion
- Disable Webhooks before proceeding with the GitHub import
- Fix importer for GitHub comments on diff
v 8.8.4
- Fix LDAP-based login for users with 2FA enabled. !4493
......
......@@ -8,6 +8,7 @@ module Gitlab
commit_id: raw_data.commit_id,
line_code: line_code,
author_id: author_id,
type: type,
created_at: raw_data.created_at,
updated_at: raw_data.updated_at
}
......@@ -53,6 +54,10 @@ module Gitlab
def note
formatter.author_line(author) + body
end
def type
'LegacyDiffNote' if on_diff?
end
end
end
end
......@@ -29,6 +29,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
commit_id: nil,
line_code: nil,
author_id: project.creator_id,
type: nil,
created_at: created_at,
updated_at: updated_at
}
......@@ -56,6 +57,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
commit_id: '6dcb09b5b57875f334f61aebed695e2e4193db5e',
line_code: 'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3',
author_id: project.creator_id,
type: 'LegacyDiffNote',
created_at: created_at,
updated_at: updated_at
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment