aboutsummaryrefslogtreecommitdiffstats
path: root/bridge/gitlab/import.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2019-12-10 21:13:54 +0100
committerGitHub <noreply@github.com>2019-12-10 21:13:54 +0100
commite96d8e6771086e20639a16abf6af30f2faa006a0 (patch)
tree606c0d2897c06e4ca226d377917437c62fdd1560 /bridge/gitlab/import.go
parentef6801a37f75fbc5f65b0a5db194b7f88b439e7b (diff)
parentf6b4830c0b68f3b5c616236bc9d51943765c8b4a (diff)
downloadgit-bug-e96d8e6771086e20639a16abf6af30f2faa006a0.tar.gz
Merge pull request #274 from MichaelMure/gitlab-bridge
bridge/gitlab: support self-hosted GitLab instance
Diffstat (limited to 'bridge/gitlab/import.go')
-rw-r--r--bridge/gitlab/import.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go
index 00dee252..4fa37505 100644
--- a/bridge/gitlab/import.go
+++ b/bridge/gitlab/import.go
@@ -52,7 +52,10 @@ func (gi *gitlabImporter) Init(repo *cache.RepoCache, conf core.Configuration) e
return ErrMissingIdentityToken
}
- gi.client = buildClient(creds[0].(*auth.Token))
+ gi.client, err = buildClient(conf[keyGitlabBaseUrl], creds[0].(*auth.Token))
+ if err != nil {
+ return err
+ }
return nil
}
@@ -151,6 +154,7 @@ func (gi *gitlabImporter) ensureIssue(repo *cache.RepoCache, issue *gitlab.Issue
metaKeyGitlabId: parseID(issue.IID),
metaKeyGitlabUrl: issue.WebURL,
metaKeyGitlabProject: gi.conf[keyProjectID],
+ metaKeyGitlabBaseUrl: gi.conf[keyGitlabBaseUrl],
},
)