web/forgejo
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Vendor Update: go-gitlab v0.22.1 -> v0.31.0 (#11136)

Browse source 
* vendor update: go-gitlab to v0.31.0

* migrate client init to v0.31.0

* refactor
This commit is contained in:
6543 2020-04-19 22:23:05 +02:00 • committed by GitHub
parent 5c092eb0ef
commit 82dbb34c9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
256 changed files with 36039 additions and 12965 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/migrations/gitlab.go
View file

@ -8,7 +8,6 @@ import (
"context"
"errors"
"fmt"
"net/http"
"net/url"
"strings"
"time"
@ -87,15 +86,13 @@ type GitlabDownloader struct {
// Use either a username/password, personal token entered into the username field, or anonymous/public access
// Note: Public access only allows very basic access
func NewGitlabDownloader(baseURL, repoPath, username, password string) *GitlabDownloader {
var client *http.Client
var gitlabClient *gitlab.Client
var err error
if username != "" {
if password == "" {
gitlabClient = gitlab.NewClient(client, username)
gitlabClient, err = gitlab.NewClient(username)
} else {
gitlabClient, err = gitlab.NewBasicAuthClient(client, baseURL, username, password)
gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL))
}
}