diff options
| author | Michael Muré <batolettre@gmail.com> | 2020-02-09 01:31:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 01:31:00 +0100 |
| commit | 9e1a987b4d94dc5c2115423ede5954d4faf1d342 (patch) | |
| tree | e30bb28d55444a7d1e66c8fa8b8ba7d413805473 /bridge/gitlab/import.go | |
| parent | 97bc5ccd229b7b438262a84e3c42783b4d4a82af (diff) | |
| parent | 9b1aaa032d36e1ac05504916e359f767d1622d9d (diff) | |
| download | git-bug-9e1a987b4d94dc5c2115423ede5954d4faf1d342.tar.gz | |
Merge pull request #294 from MichaelMure/cred-metadata
Cred metadata
Diffstat (limited to 'bridge/gitlab/import.go')
| -rw-r--r-- | bridge/gitlab/import.go | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go index fa6bbfb6..d699554b 100644 --- a/bridge/gitlab/import.go +++ b/bridge/gitlab/import.go @@ -13,7 +13,6 @@ import ( "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/util/text" ) @@ -34,20 +33,7 @@ type gitlabImporter struct { func (gi *gitlabImporter) Init(repo *cache.RepoCache, conf core.Configuration) error { gi.conf = conf - opts := []auth.Option{ - auth.WithTarget(target), - auth.WithKind(auth.KindToken), - } - - user, err := repo.GetUserIdentity() - if err == nil { - opts = append(opts, auth.WithUserId(user.Id())) - } - if err == identity.ErrNoIdentitySet { - opts = append(opts, auth.WithUserId(auth.DefaultUserId)) - } - - creds, err := auth.List(repo, opts...) + creds, err := auth.List(repo, auth.WithTarget(target), auth.WithKind(auth.KindToken)) if err != nil { return err } @@ -403,7 +389,6 @@ func (gi *gitlabImporter) ensurePerson(repo *cache.RepoCache, id int) (*cache.Id i, err = repo.NewIdentityRaw( user.Name, user.PublicEmail, - user.Username, user.AvatarURL, map[string]string{ // because Gitlab |