Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/gitlab_import/importer.rb')
-rw-r--r--lib/gitlab/gitlab_import/importer.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index c5304a0699b..50594d2b24f 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,7 +5,9 @@ module Gitlab
def initialize(project)
@project = project
- @client = Client.new(project.creator.gitlab_access_token)
+ import_data = project.import_data.try(:data)
+ gitlab_session = import_data["gitlab_session"] if import_data
+ @client = Client.new(gitlab_session["gitlab_access_token"])
@formatter = Gitlab::ImportFormatter.new
end
@@ -14,12 +16,12 @@ module Gitlab
#Issues && Comments
issues = client.issues(project_identifier)
-
+
issues.each do |issue|
body = @formatter.author_line(issue["author"]["name"], issue["description"])
-
+
comments = client.issue_comments(project_identifier, issue["id"])
-
+
if comments.any?
body += @formatter.comments_header
end
@@ -29,13 +31,13 @@ module Gitlab
end
project.issues.create!(
- description: body,
+ description: body,
title: issue["title"],
state: issue["state"],
author_id: gl_user_id(project, issue["author"]["id"])
)
end
-
+
true
end