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/jira_import/issue_serializer.rb')
-rw-r--r--lib/gitlab/jira_import/issue_serializer.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/jira_import/issue_serializer.rb b/lib/gitlab/jira_import/issue_serializer.rb
index 43280606bb6..ab748d67fbf 100644
--- a/lib/gitlab/jira_import/issue_serializer.rb
+++ b/lib/gitlab/jira_import/issue_serializer.rb
@@ -52,9 +52,10 @@ module Gitlab
end
def map_user_id(jira_user)
- return unless jira_user&.dig('accountId')
+ jira_user_identifier = jira_user&.dig('accountId') || jira_user&.dig('key')
+ return unless jira_user_identifier
- Gitlab::JiraImport.get_user_mapping(project.id, jira_user['accountId'])
+ Gitlab::JiraImport.get_user_mapping(project.id, jira_user_identifier)
end
def reporter