mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 12:15:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

#1064: X-Gogs-Event header is empty

Browse source
This commit is contained in:
Unknwon 2015-03-18 04:51:02 -04:00
parent 49aeb87e44
commit 82f7a01ded
4 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.5.16.0317 Beta"
const APP_VER = "0.5.16.0318 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

40
models/action.go
View file

@ -417,32 +417,28 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
continue
}
var payload BasePayload
switch w.HookTaskType {
case SLACK:
{
s, err := GetSlackPayload(p, w.Meta)
if err != nil {
return errors.New("action.GetSlackPayload: " + err.Error())
}
CreateHookTask(&HookTask{
Type: w.HookTaskType,
Url: w.Url,
BasePayload: s,
ContentType: w.ContentType,
IsSsl: w.IsSsl,
})
s, err := GetSlackPayload(p, w.Meta)
if err != nil {
return errors.New("action.GetSlackPayload: " + err.Error())
}
payload = s
default:
{
p.Secret = w.Secret
CreateHookTask(&HookTask{
Type: w.HookTaskType,
Url: w.Url,
BasePayload: p,
ContentType: w.ContentType,
IsSsl: w.IsSsl,
})
}
payload = p
p.Secret = w.Secret
}
if err = CreateHookTask(&HookTask{
Type: w.HookTaskType,
Url: w.Url,
BasePayload: payload,
ContentType: w.ContentType,
EventType: HOOK_EVENT_PUSH,
IsSsl: w.IsSsl,
}); err != nil {
return fmt.Errorf("CreateHookTask: %v", err)
}
}

2
models/webhook.go
View file

@ -205,7 +205,7 @@ func IsValidHookTaskType(name string) bool {
type HookEventType string
const (
PUSH HookEventType = "push"
HOOK_EVENT_PUSH HookEventType = "push"
)
// FIXME: just use go-gogs-client structs maybe?

2
templates/.VERSION
View file

@ -1 +1 @@
0.5.16.0317 Beta
0.5.16.0318 Beta