diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-07 14:04:32 +0300 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-06-14 23:15:52 +0300 |
| commit | 6e23d642ddb00f7eb05aa74ba666802b398ee39b (patch) | |
| tree | cf56fa878f3ed6518cbec77bd9a6f86657e728fc | |
| parent | 212ebdfb413de6c53b64e889af2cdf50e6bb9434 (diff) | |
Merge branch 'gh-fix-comments-on-diff'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/github_import/comment_formatter.rb | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/github_import/comment_formatter_spec.rb | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e44ee2b518c..feee06a3968 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/lib/gitlab/github_import/comment_formatter.rb b/lib/gitlab/github_import/comment_formatter.rb index 7d679eaec6a..2c1b94ef2cd 100644 --- a/lib/gitlab/github_import/comment_formatter.rb +++ b/lib/gitlab/github_import/comment_formatter.rb @@ -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 diff --git a/spec/lib/gitlab/github_import/comment_formatter_spec.rb b/spec/lib/gitlab/github_import/comment_formatter_spec.rb index 55e86d4ceac..9ae02a6c45f 100644 --- a/spec/lib/gitlab/github_import/comment_formatter_spec.rb +++ b/spec/lib/gitlab/github_import/comment_formatter_spec.rb @@ -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 } |