mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-23 02:11:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2241 from tboerger/fix-gitea

Browse source 
Urgent fix for changed auth behavior on Gitea
This commit is contained in:
Brad Rydzewski 2017-10-13 07:59:47 -07:00 committed by GitHub
commit 578e8847cf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
remote/gitea/gitea.go
View file

@ -271,8 +271,8 @@ func (c *client) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
}, nil
}
return &model.Netrc{
Login: u.Token,
Password: "x-oauth-basic",
Login: u.Login,
Password: u.Token,
Machine: c.Machine,
}, nil
}

4
remote/gitea/gitea_test.go
View file

@ -55,8 +55,8 @@ func Test_gitea(t *testing.T) {
})
netrc, _ := remote.Netrc(fakeUser, nil)
g.Assert(netrc.Machine).Equal("gitea.com")
g.Assert(netrc.Login).Equal(fakeUser.Token)
g.Assert(netrc.Password).Equal("x-oauth-basic")
g.Assert(netrc.Login).Equal(fakeUser.Login)
g.Assert(netrc.Password).Equal(fakeUser.Token)
})
g.It("Should return a netrc with the machine account", func() {
remote, _ := New(Opts{