summaryrefslogtreecommitdiffstats
path: root/api/webhook.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-08 07:34:39 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-08 07:34:39 -0500
commitbe70bbc2f027bcc32d54e03c6b66f7e3aadec425 (patch)
tree02cbf3694b44045422b46fdb90a4b272c1fad976 /api/webhook.go
parent9b35fb5fa59099fe644a1b1ef3734b09b50f98bf (diff)
parent9f5f18a93a6db2b9c1089862fb68c2ee33e634ca (diff)
downloadchat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.tar.gz
chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.tar.bz2
chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.zip
Merge pull request #2083 from mattermost/plt-1879
PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix deleteā€¦
Diffstat (limited to 'api/webhook.go')
-rw-r--r--api/webhook.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/webhook.go b/api/webhook.go
index 3906d09be..c0f8ea506 100644
--- a/api/webhook.go
+++ b/api/webhook.go
@@ -238,7 +238,7 @@ func getOutgoingHooks(c *Context, w http.ResponseWriter, r *http.Request) {
}
func deleteOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) {
- if !utils.Cfg.ServiceSettings.EnableIncomingWebhooks {
+ if !utils.Cfg.ServiceSettings.EnableOutgoingWebhooks {
c.Err = model.NewLocAppError("deleteOutgoingHook", "api.webhook.delete_outgoing.disabled.app_error", nil, "")
c.Err.StatusCode = http.StatusNotImplemented
return