From f6cb42f3d197b7920207088f5fa5f5161be90905 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 14 Apr 2015 13:13:18 +0200
Subject: [PATCH] Add comment number to imported Google Code comments.
---
lib/gitlab/google_code_import/importer.rb | 6 +++---
spec/lib/gitlab/google_code_import/importer_spec.rb | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index 07eccfa4db8..eaa8c6bc6d3 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -52,7 +52,7 @@ module Gitlab
deleted_issues = []
issues = repo.raw_data["issues"]["items"]
- issues.each_with_index do |raw_issue, i|
+ issues.each do |raw_issue|
while raw_issue["id"] > last_id + 1
last_id += 1
@@ -116,14 +116,14 @@ module Gitlab
end
def import_issue_comments(issue, comments)
- comments.each_with_index do |raw_comment, i|
+ comments.each do |raw_comment|
next if raw_comment.has_key?("deletedBy")
author = mask_email(raw_comment["author"]["name"])
date = DateTime.parse(raw_comment["published"]).to_formatted_s(:long)
body = []
- body << "*By #{author} on #{date}*"
+ body << "*Comment #{raw_comment["id"]} by #{author} on #{date}*"
body << "---"
content = format_content(raw_comment["content"])
diff --git a/spec/lib/gitlab/google_code_import/importer_spec.rb b/spec/lib/gitlab/google_code_import/importer_spec.rb
index 9ff972b2111..370d4410104 100644
--- a/spec/lib/gitlab/google_code_import/importer_spec.rb
+++ b/spec/lib/gitlab/google_code_import/importer_spec.rb
@@ -57,6 +57,7 @@ describe Gitlab::GoogleCodeImport::Importer do
note = project.issues.first.notes.first
expect(note).to_not be_nil
+ expect(note.note).to include("Comment 1")
expect(note.note).to include("thilo...")
expect(note.note).to include("November 18, 2009 05:14")
expect(note.note).to include("applied, thanks.")
--
GitLab