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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Markus Schölzel 2018-02-16 10:25:04 +01:00
commit 365a3058ea
5 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
remote/gitea/fixtures/hooks.go
View file

@ -103,13 +103,11 @@ const HookPullRequest = `{
"email": "gordon@golang.org",
"avatar_url": "http://gitea.golang.org///1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87"
},
"base_branch": "master",
"base": {
"label": "master",
"ref": "master",
"sha": "9353195a19e45482665306e466c832c46560532d"
},
"head_branch": "feature/changes",
"head": {
"label": "feature/changes",
"ref": "feature/changes",

6
remote/gitea/helper.go
View file

@ -127,15 +127,15 @@ func buildFromPullRequest(hook *pullRequestHook) *model.Build {
Commit: hook.PullRequest.Head.Sha,
Link: hook.PullRequest.URL,
Ref: fmt.Sprintf("refs/pull/%d/head", hook.Number),
Branch: hook.PullRequest.BaseBranch,
Branch: hook.PullRequest.Base.Ref,
Message: hook.PullRequest.Title,
Author: hook.PullRequest.User.Username,
Avatar: avatar,
Sender: sender,
Title: hook.PullRequest.Title,
Refspec: fmt.Sprintf("%s:%s",
hook.PullRequest.HeadBranch,
hook.PullRequest.BaseBranch,
hook.PullRequest.Head.Ref,
hook.PullRequest.Base.Ref,
),
}
return build

1
remote/gitea/helper_test.go
View file

@ -127,6 +127,7 @@ func Test_parse(t *testing.T) {
g.Assert(build.Ref).Equal("refs/pull/1/head")
g.Assert(build.Link).Equal(hook.PullRequest.URL)
g.Assert(build.Branch).Equal("master")
g.Assert(build.Refspec).Equal("feature/changes:master")
g.Assert(build.Message).Equal(hook.PullRequest.Title)
g.Assert(build.Avatar).Equal("http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87")
g.Assert(build.Author).Equal(hook.PullRequest.User.Username)

22
remote/gitea/types.go
View file

@ -54,16 +54,15 @@ type pullRequestHook struct {
Email string `json:"email"`
Avatar string `json:"avatar_url"`
} `json:"user"`
Title string `json:"title"`
Body string `json:"body"`
Labels []string `json:"labels"`
State string `json:"state"`
URL string `json:"html_url"`
Mergeable bool `json:"mergeable"`
Merged bool `json:"merged"`
MergeBase string `json:"merge_base"`
BaseBranch string `json:"base_branch"`
Base struct {
Title string `json:"title"`
Body string `json:"body"`
Labels []string `json:"labels"`
State string `json:"state"`
URL string `json:"html_url"`
Mergeable bool `json:"mergeable"`
Merged bool `json:"merged"`
MergeBase string `json:"merge_base"`
Base struct {
Label string `json:"label"`
Ref string `json:"ref"`
Sha string `json:"sha"`
@ -82,8 +81,7 @@ type pullRequestHook struct {
} `json:"owner"`
} `json:"repo"`
} `json:"base"`
HeadBranch string `json:"head_branch"`
Head struct {
Head struct {
Label string `json:"label"`
Ref string `json:"ref"`
Sha string `json:"sha"`

2
server/repo.go
View file

@ -100,7 +100,7 @@ func PatchRepo(c *gin.Context) {
return
}
if (in.IsTrusted != nil || in.Timeout != nil || in.BuildCounter != nil) && !user.Admin {
if (in.IsTrusted != nil || in.Timeout != nil) && !user.Admin {
c.String(403, "Insufficient privileges")
return
}