diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 12:08:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 12:08:49 +0300 |
commit | 00a889ea7a115ebbda95a071dd630f93b79261e3 (patch) | |
tree | 25afde9634fcee21f763fed8934480ced47abcad /lib/gitlab/jira_import | |
parent | d950ea420a77bc6b27037bd00484f2463e79b4fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/jira_import')
-rw-r--r-- | lib/gitlab/jira_import/issue_serializer.rb | 5 |
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 |