diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-04-09 13:01:14 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2021-04-09 13:01:14 +0200 |
| commit | 1520f678f7a2bc6e01d9b01df5ce49f2f46be7d7 (patch) | |
| tree | f6d71c1f29cf06ccab9e4ae434b19ab17caa4385 /bridge/jira | |
| parent | 0fd570171d171aa574d7f01d6033a9c01d668465 (diff) | |
| parent | bc5f618eba812859bf87ce2c31b278bd518d4555 (diff) | |
| download | git-bug-1520f678f7a2bc6e01d9b01df5ce49f2f46be7d7.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-gh-bridge
Diffstat (limited to 'bridge/jira')
| -rw-r--r-- | bridge/jira/export.go | 2 | ||||
| -rw-r--r-- | bridge/jira/import.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bridge/jira/export.go b/bridge/jira/export.go index e6167966..34f41d09 100644 --- a/bridge/jira/export.go +++ b/bridge/jira/export.go @@ -309,7 +309,7 @@ func (je *jiraExporter) exportBug(ctx context.Context, b *cache.BugCache, out ch continue } - opAuthor := op.GetAuthor() + opAuthor := op.Author() client, err := je.getClientForIdentity(opAuthor.Id()) if err != nil { out <- core.NewExportError( diff --git a/bridge/jira/import.go b/bridge/jira/import.go index 54c4ca35..f9daadd8 100644 --- a/bridge/jira/import.go +++ b/bridge/jira/import.go @@ -198,6 +198,7 @@ func (ji *jiraImporter) ensurePerson(repo *cache.RepoCache, user User) (*cache.I user.EmailAddress, user.Key, "", + nil, map[string]string{ metaKeyJiraUser: user.Key, }, |