summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/bitbucket/representation/issue.rb4
-rw-r--r--lib/gitlab/bitbucket_import/importer.rb2
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/bitbucket/representation/issue.rb b/lib/bitbucket/representation/issue.rb
index ffe8a65d839..3af731753d1 100644
--- a/lib/bitbucket/representation/issue.rb
+++ b/lib/bitbucket/representation/issue.rb
@@ -27,6 +27,10 @@ module Bitbucket
raw['title']
end
+ def milestone
+ raw.dig('milestone', 'name')
+ end
+
def created_at
raw['created_on']
end
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 567f2b314aa..53c95ea4079 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -67,6 +67,7 @@ module Gitlab
description += issue.description
label_name = issue.kind
+ milestone = issue.milestone ? project.milestones.find_or_create_by(title: issue.milestone) : nil
issue = project.issues.create!(
iid: issue.iid,
@@ -74,6 +75,7 @@ module Gitlab
description: description,
state: issue.state,
author_id: gitlab_user_id(project, issue.author),
+ milestone: milestone,
created_at: issue.created_at,
updated_at: issue.updated_at
)