mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-26 21:54:19 -04:00
#1064: X-Gogs-Event header is empty
This commit is contained in:
parent
49aeb87e44
commit
82f7a01ded
2
gogs.go
2
gogs.go
@ -17,7 +17,7 @@ import (
|
|||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.5.16.0317 Beta"
|
const APP_VER = "0.5.16.0318 Beta"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
@ -417,32 +417,28 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var payload BasePayload
|
||||||
switch w.HookTaskType {
|
switch w.HookTaskType {
|
||||||
case SLACK:
|
case SLACK:
|
||||||
{
|
s, err := GetSlackPayload(p, w.Meta)
|
||||||
s, err := GetSlackPayload(p, w.Meta)
|
if err != nil {
|
||||||
if err != nil {
|
return errors.New("action.GetSlackPayload: " + err.Error())
|
||||||
return errors.New("action.GetSlackPayload: " + err.Error())
|
|
||||||
}
|
|
||||||
CreateHookTask(&HookTask{
|
|
||||||
Type: w.HookTaskType,
|
|
||||||
Url: w.Url,
|
|
||||||
BasePayload: s,
|
|
||||||
ContentType: w.ContentType,
|
|
||||||
IsSsl: w.IsSsl,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
payload = s
|
||||||
default:
|
default:
|
||||||
{
|
payload = p
|
||||||
p.Secret = w.Secret
|
p.Secret = w.Secret
|
||||||
CreateHookTask(&HookTask{
|
}
|
||||||
Type: w.HookTaskType,
|
|
||||||
Url: w.Url,
|
if err = CreateHookTask(&HookTask{
|
||||||
BasePayload: p,
|
Type: w.HookTaskType,
|
||||||
ContentType: w.ContentType,
|
Url: w.Url,
|
||||||
IsSsl: w.IsSsl,
|
BasePayload: payload,
|
||||||
})
|
ContentType: w.ContentType,
|
||||||
}
|
EventType: HOOK_EVENT_PUSH,
|
||||||
|
IsSsl: w.IsSsl,
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("CreateHookTask: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,7 +205,7 @@ func IsValidHookTaskType(name string) bool {
|
|||||||
type HookEventType string
|
type HookEventType string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
PUSH HookEventType = "push"
|
HOOK_EVENT_PUSH HookEventType = "push"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FIXME: just use go-gogs-client structs maybe?
|
// FIXME: just use go-gogs-client structs maybe?
|
||||||
|
@ -1 +1 @@
|
|||||||
0.5.16.0317 Beta
|
0.5.16.0318 Beta
|
Loading…
Reference in New Issue
Block a user