diff options
| -rw-r--r-- | bridge/gitlab/import.go | 4 | ||||
| -rw-r--r-- | webui/package-lock.json | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go index 897d65de..cf4f0039 100644 --- a/bridge/gitlab/import.go +++ b/bridge/gitlab/import.go @@ -127,8 +127,8 @@ func (gi *gitlabImporter) ensureIssue(repo *cache.RepoCache, issue *gitlab.Issue 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] + excerpt.CreateMetadata[metaKeyGitlabBaseUrl] == gi.conf[confKeyGitlabBaseUrl] && + excerpt.CreateMetadata[metaKeyGitlabProject] == gi.conf[confKeyProjectID] }) if err == nil { return b, nil diff --git a/webui/package-lock.json b/webui/package-lock.json index 8809a0ba..7d9d8503 100644 --- a/webui/package-lock.json +++ b/webui/package-lock.json @@ -12932,9 +12932,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "inline-style-parser": { "version": "0.1.1", |