From 0e89923854fe015638e9df0857ee186748380f53 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 12 Dec 2021 21:40:36 +0100
Subject: [PATCH] rm workaround for gitlab webhook parsing (#601)

upstream got merged: https://github.com/xanzy/go-gitlab/pull/1282
possible because of #599
---
 server/remote/gitlab/gitlab.go | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/server/remote/gitlab/gitlab.go b/server/remote/gitlab/gitlab.go
index 923127970..c453b46c7 100644
--- a/server/remote/gitlab/gitlab.go
+++ b/server/remote/gitlab/gitlab.go
@@ -17,7 +17,6 @@ package gitlab
 import (
 	"context"
 	"crypto/tls"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -467,26 +466,7 @@ func (g *Gitlab) Hook(req *http.Request) (*model.Repo, *model.Build, error) {
 		return nil, nil, err
 	}
 
-	eventType := gitlab.WebhookEventType(req)
-	// TODO: Fix Upstream: We get `Service Hook` - which the library do not understand
-	if eventType == "Service Hook" {
-		e := struct {
-			ObjectKind string `json:"object_kind"`
-		}{}
-		if err := json.Unmarshal(payload, &e); err != nil {
-			return nil, nil, err
-		}
-		switch e.ObjectKind {
-		case "push":
-			eventType = gitlab.EventTypePush
-		case "tag_push":
-			eventType = gitlab.EventTypeTagPush
-		case "merge_request":
-			eventType = gitlab.EventTypeMergeRequest
-		}
-	}
-
-	parsed, err := gitlab.ParseWebhook(eventType, payload)
+	parsed, err := gitlab.ParseWebhook(gitlab.WebhookEventType(req), payload)
 	if err != nil {
 		return nil, nil, err
 	}