merge: fixed conflicts in discord PR

2018-05-07 15:40:43 +02:00
parent 249c1e8d3d c4b57a2562
commit e5e8b9800c
6 changed files with 259 additions and 19 deletions
@@ -104,12 +104,13 @@ func (ns *NotificationService) Run(ctx context.Context) error {

 func (ns *NotificationService) SendWebhookSync(ctx context.Context, cmd *m.SendWebhookSync) error {
 	return ns.sendWebRequestSync(ctx, &Webhook{
-		Url:        cmd.Url,
-		User:       cmd.User,
-		Password:   cmd.Password,
-		Body:       cmd.Body,
-		HttpMethod: cmd.HttpMethod,
-		HttpHeader: cmd.HttpHeader,
+		Url:         cmd.Url,
+		User:        cmd.User,
+		Password:    cmd.Password,
+		Body:        cmd.Body,
+		HttpMethod:  cmd.HttpMethod,
+		HttpHeader:  cmd.HttpHeader,
+		ContentType: cmd.ContentType,
 	})
 }