diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /lib/gitlab/bitbucket_import | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'lib/gitlab/bitbucket_import')
-rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index f79baadb8ea..d58de7eb211 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -86,13 +86,15 @@ module Gitlab create_labels + issue_type_id = WorkItems::Type.default_issue_type.id + client.issues(repo).each do |issue| - import_issue(issue) + import_issue(issue, issue_type_id) end end # rubocop: disable CodeReuse/ActiveRecord - def import_issue(issue) + def import_issue(issue, issue_type_id) description = '' description += @formatter.author_line(issue.author) unless find_user_id(issue.author) description += issue.description @@ -106,7 +108,9 @@ module Gitlab description: description, state_id: Issue.available_states[issue.state], author_id: gitlab_user_id(project, issue.author), + namespace_id: project.project_namespace_id, milestone: milestone, + work_item_type_id: issue_type_id, created_at: issue.created_at, updated_at: issue.updated_at ) |