diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 18:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 18:09:46 +0300 |
| commit | 7f305b576b51c3503970ef224cf4b31e247a322d (patch) | |
| tree | 9a3b0ddfb8640fd1a66307a38fe6ba264e5d99dd /lib/gitlab/jira_import | |
| parent | 04edf6545802ed0515e221038b63fc96ad3e6d54 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/jira_import')
| -rw-r--r-- | lib/gitlab/jira_import/base_importer.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab/jira_import/issue_serializer.rb | 7 | ||||
| -rw-r--r-- | lib/gitlab/jira_import/issues_importer.rb | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/gitlab/jira_import/base_importer.rb b/lib/gitlab/jira_import/base_importer.rb index 5381812186d..306736df30f 100644 --- a/lib/gitlab/jira_import/base_importer.rb +++ b/lib/gitlab/jira_import/base_importer.rb @@ -3,12 +3,13 @@ module Gitlab module JiraImport class BaseImporter - attr_reader :project, :client, :formatter, :jira_project_key + attr_reader :project, :client, :formatter, :jira_project_key, :running_import def initialize(project) project.validate_jira_import_settings! - @jira_project_key = project.latest_jira_import&.jira_project_key + @running_import = project.latest_jira_import + @jira_project_key = running_import&.jira_project_key raise Projects::ImportService::Error, _('Unable to find Jira project to import data from.') unless @jira_project_key diff --git a/lib/gitlab/jira_import/issue_serializer.rb b/lib/gitlab/jira_import/issue_serializer.rb index 244c9fd637d..9bbee901b14 100644 --- a/lib/gitlab/jira_import/issue_serializer.rb +++ b/lib/gitlab/jira_import/issue_serializer.rb @@ -3,11 +3,12 @@ module Gitlab module JiraImport class IssueSerializer - attr_reader :jira_issue, :project, :params, :formatter + attr_reader :jira_issue, :project, :import_owner_id, :params, :formatter - def initialize(project, jira_issue, params = {}) + def initialize(project, jira_issue, import_owner_id, params = {}) @jira_issue = jira_issue @project = project + @import_owner_id = import_owner_id @params = params @formatter = Gitlab::ImportFormatter.new end @@ -71,7 +72,7 @@ module Gitlab end def reporter - map_user_id(jira_issue&.reporter&.emailAddress) || project.creator_id + map_user_id(jira_issue&.reporter&.emailAddress) || import_owner_id end def assignees diff --git a/lib/gitlab/jira_import/issues_importer.rb b/lib/gitlab/jira_import/issues_importer.rb index 6543b633ddf..8c18e58d9df 100644 --- a/lib/gitlab/jira_import/issues_importer.rb +++ b/lib/gitlab/jira_import/issues_importer.rb @@ -57,7 +57,7 @@ module Gitlab # For such cases we exit early if issue was already imported. next if already_imported?(jira_issue.id) - issue_attrs = IssueSerializer.new(project, jira_issue, { iid: next_iid }).execute + issue_attrs = IssueSerializer.new(project, jira_issue, running_import.user_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 |