Commit acef028d authored by Douwe Maan's avatar Douwe Maan

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

parents affd58fb 7c072c76
...@@ -50,6 +50,7 @@ v 8.8.4 (unreleased) ...@@ -50,6 +50,7 @@ v 8.8.4 (unreleased)
- Upgrade to jQuery 2 - Upgrade to jQuery 2
- Remove prev/next buttons on issues and merge requests - Remove prev/next buttons on issues and merge requests
- Import GitHub repositories respecting the API rate limit - Import GitHub repositories respecting the API rate limit
- Fix importer for GitHub comments on diff
v 8.8.3 v 8.8.3
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312 - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
......
...@@ -8,6 +8,7 @@ module Gitlab ...@@ -8,6 +8,7 @@ module Gitlab
commit_id: raw_data.commit_id, commit_id: raw_data.commit_id,
line_code: line_code, line_code: line_code,
author_id: author_id, author_id: author_id,
type: type,
created_at: raw_data.created_at, created_at: raw_data.created_at,
updated_at: raw_data.updated_at updated_at: raw_data.updated_at
} }
...@@ -53,6 +54,10 @@ module Gitlab ...@@ -53,6 +54,10 @@ module Gitlab
def note def note
formatter.author_line(author) + body formatter.author_line(author) + body
end end
def type
'LegacyDiffNote' if on_diff?
end
end end
end end
end end
...@@ -29,6 +29,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do ...@@ -29,6 +29,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
commit_id: nil, commit_id: nil,
line_code: nil, line_code: nil,
author_id: project.creator_id, author_id: project.creator_id,
type: nil,
created_at: created_at, created_at: created_at,
updated_at: updated_at updated_at: updated_at
} }
...@@ -56,6 +57,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do ...@@ -56,6 +57,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
commit_id: '6dcb09b5b57875f334f61aebed695e2e4193db5e', commit_id: '6dcb09b5b57875f334f61aebed695e2e4193db5e',
line_code: 'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3', line_code: 'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3',
author_id: project.creator_id, author_id: project.creator_id,
type: 'LegacyDiffNote',
created_at: created_at, created_at: created_at,
updated_at: updated_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