#1064: X-Gogs-Event header is empty

4 files changed, 21 insertions, 25 deletions

diff --git a/gogs.go b/gogs.go
index cb2ad043dc..95cd004534 100644
--- a/gogs.go
+++ b/gogs.go
@@ -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())
diff --git a/models/action.go b/models/action.go
index 037ccbd611..d3393728fb 100644
--- a/models/action.go
+++ b/models/action.go
@@ -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)
 		}
 	}
 
diff --git a/models/webhook.go b/models/webhook.go
index 96af0b6967..bfa52b9902 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -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?
diff --git a/templates/.VERSION b/templates/.VERSION
index 8e8514e6d6..4faf051b44 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.16.0317 Beta
\ No newline at end of file
+0.5.16.0318 Beta
\ No newline at end of file