diff options
| author | Christopher Brickley <brickley@gmail.com> | 2014-10-24 08:56:12 -0400 |
|---|---|---|
| committer | Christopher Brickley <brickley@gmail.com> | 2014-10-24 08:56:12 -0400 |
| commit | 3794111460e8f69a69bfaacade2978fe89644270 (patch) | |
| tree | e6361647a56f6d8df3b9d6b019d7627fb5eb7ad8 /routers/repo | |
| parent | d7ea49b9f52a065dc34933ecc056e3b6b6b0fad9 (diff) | |
| download | gitea-3794111460e8f69a69bfaacade2978fe89644270.tar.gz gitea-3794111460e8f69a69bfaacade2978fe89644270.zip | |
update slack hook to use new format
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/setting.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 971c5bef2a..a8e80272c1 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -483,9 +483,7 @@ func SlackHooksNewPost(ctx *middleware.Context, form auth.NewSlackHookForm) { } meta, err := json.Marshal(&models.Slack{ - Domain: form.Domain, Channel: form.Channel, - Token: form.Token, }) if err != nil { ctx.Handle(500, "SlackHooksNewPost: JSON marshal failed: ", err) @@ -494,7 +492,7 @@ func SlackHooksNewPost(ctx *middleware.Context, form auth.NewSlackHookForm) { w := &models.Webhook{ RepoId: orCtx.RepoId, - Url: models.GetSlackURL(form.Domain, form.Token), + Url: form.PayloadUrl, ContentType: models.JSON, Secret: "", HookEvent: &models.HookEvent{ @@ -551,16 +549,14 @@ func SlackHooksEditPost(ctx *middleware.Context, form auth.NewSlackHookForm) { return } meta, err := json.Marshal(&models.Slack{ - Domain: form.Domain, Channel: form.Channel, - Token: form.Token, }) if err != nil { ctx.Handle(500, "SlackHooksNewPost: JSON marshal failed: ", err) return } - w.Url = models.GetSlackURL(form.Domain, form.Token) + w.Url = form.PayloadUrl w.Meta = string(meta) w.HookEvent = &models.HookEvent{ PushOnly: form.PushOnly, |