summaryrefslogtreecommitdiffstatshomepage
path: root/bridge/gitlab/import.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-03-28 17:11:16 +0100
committerGitHub <noreply@github.com>2020-03-28 17:11:16 +0100
commit58abc6b0a35b679ac0c34579ff1cb53c8fa71af4 (patch)
treea2a9556a580d21f1850c06eeb591a44acc0d2373 /bridge/gitlab/import.go
parent5491d12873732d05d2f08cfe784985eee6e41a20 (diff)
parenta8666bfeb8255c2a0a9eed55ba143d65237febbf (diff)
downloadgit-bug-58abc6b0a35b679ac0c34579ff1cb53c8fa71af4.tar.gz
git-bug-58abc6b0a35b679ac0c34579ff1cb53c8fa71af4.zip
Merge pull request #358 from MichaelMure/gitlab-tests
gitlab: fix issues import url
Diffstat (limited to 'bridge/gitlab/import.go')
-rw-r--r--bridge/gitlab/import.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go
index 5ed5f0e3..0a47a783 100644
--- a/bridge/gitlab/import.go
+++ b/bridge/gitlab/import.go
@@ -123,7 +123,12 @@ func (gi *gitlabImporter) ensureIssue(repo *cache.RepoCache, issue *gitlab.Issue
}
// resolve bug
- b, err := repo.ResolveBugCreateMetadata(metaKeyGitlabUrl, issue.WebURL)
+ b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
+ return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
+ excerpt.CreateMetadata[metaKeyGitlabId] == parseID(issue.IID) &&
+ excerpt.CreateMetadata[metaKeyGitlabBaseUrl] == gi.conf[confKeyProjectID] &&
+ excerpt.CreateMetadata[metaKeyGitlabProject] == gi.conf[confKeyGitlabBaseUrl]
+ })
if err == nil {
return b, nil
}