Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 4 deletions

diff --git a/lib/gitlab/jira_import/issue_serializer.rb b/lib/gitlab/jira_import/issue_serializer.rb
index ab748d67fbf..96cae916ed7 100644
--- a/lib/gitlab/jira_import/issue_serializer.rb
+++ b/lib/gitlab/jira_import/issue_serializer.rb
@@ -5,10 +5,11 @@ module Gitlab
     class IssueSerializer
       attr_reader :jira_issue, :project, :import_owner_id, :params, :formatter
 
-      def initialize(project, jira_issue, import_owner_id, params = {})
+      def initialize(project, jira_issue, import_owner_id, work_item_type_id, params = {})
         @jira_issue = jira_issue
         @project = project
         @import_owner_id = import_owner_id
+        @work_item_type_id = work_item_type_id
         @params = params
         @formatter = Gitlab::ImportFormatter.new
       end
@@ -24,7 +25,8 @@ module Gitlab
           created_at: jira_issue.created,
           author_id: reporter,
           assignee_ids: assignees,
-          label_ids: label_ids
+          label_ids: label_ids,
+          work_item_type_id: @work_item_type_id
         }
       end
 
diff --git a/lib/gitlab/jira_import/issues_importer.rb b/lib/gitlab/jira_import/issues_importer.rb
index 8a03162f111..f1ead57c911 100644
--- a/lib/gitlab/jira_import/issues_importer.rb
+++ b/lib/gitlab/jira_import/issues_importer.rb
@@ -16,6 +16,7 @@ module Gitlab
         @start_at = Gitlab::JiraImport.get_issues_next_start_at(project.id)
         @imported_items_cache_key = JiraImport.already_imported_cache_key(:issues, project.id)
         @job_waiter = JobWaiter.new
+        @issue_type_id = WorkItems::Type.default_issue_type.id
       end
 
       def execute
@@ -58,8 +59,13 @@ module Gitlab
           next if already_imported?(jira_issue.id)
 
           begin
-            issue_attrs = IssueSerializer.new(project, jira_issue, running_import.user_id, { iid: next_iid }).execute
-
+            issue_attrs = IssueSerializer.new(
+              project,
+              jira_issue,
+              running_import.user_id,
+              @issue_type_id,
+              { iid: next_iid }
+            ).execute
             Gitlab::JiraImport::ImportIssueWorker.perform_async(project.id, jira_issue.id, issue_attrs, job_waiter.key)
 
             job_waiter.jobs_remaining += 1