From af6e2c29eb0a8610fe218e8ec85e739433eac729 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 1 Oct 2015 14:07:20 -0400
Subject: Implement outgoing webhooks.

---
 config/config.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index 8ef151350..3980d4b98 100644
--- a/config/config.json
+++ b/config/config.json
@@ -6,10 +6,12 @@
         "GoogleDeveloperKey": "",
         "EnableOAuthServiceProvider": false,
         "EnableIncomingWebhooks": true,
+        "EnableOutgoingWebhooks": true,
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
         "EnableTesting": false,
         "EnableSecurityFixAlert": true
+        "EnableTesting": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
@@ -89,4 +91,4 @@
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-1-g7c22


From f24ea30a75ad52b695f5f275139af1c0495624ac Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 16 Oct 2015 11:17:24 -0400
Subject: Refactor to hit database less often.

---
 config/config.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index 3980d4b98..37109428d 100644
--- a/config/config.json
+++ b/config/config.json
@@ -11,7 +11,6 @@
         "EnablePostIconOverride": false,
         "EnableTesting": false,
         "EnableSecurityFixAlert": true
-        "EnableTesting": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
@@ -91,4 +90,4 @@
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22