summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-06-07 13:04:32 +0200
committerDouwe Maan <douwe@selenight.nl>2016-06-07 13:04:32 +0200
commitacef028d85f18f3c6fcb405ce91f540fcf0f3d69 (patch)
tree85404f65bb66313876b4c7d2be9df98f9339cb96 /lib
parentaffd58fb79e4e1e57e0ce1521422e5c4ce3277d7 (diff)
parent7c072c76fc05f7db51e7d7ba6cb0fad2850ecf85 (diff)
downloadgitlab-ce-acef028d85f18f3c6fcb405ce91f540fcf0f3d69.tar.gz
Merge branch 'gh-fix-comments-on-diff'
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/github_import/comment_formatter.rb5
1 files changed, 5 insertions, 0 deletions
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