diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /lib/gitlab/jira_import | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
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 |