From 1262d254736229618582f0963c9c30c4e66efb98 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 31 Jan 2018 09:49:15 -0800
Subject: User based rate limiting (#8152)

---
 config/default.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/default.json')

diff --git a/config/default.json b/config/default.json
index 4bcccdf19..e0fda74cd 100644
--- a/config/default.json
+++ b/config/default.json
@@ -180,6 +180,7 @@
         "MaxBurst": 100,
         "MemoryStoreSize": 10000,
         "VaryByRemoteAddr": true,
+        "VaryByUser": false,
         "VaryByHeader": ""
     },
     "PrivacySettings": {
-- 
cgit v1.2.3-1-g7c22


From 741f11a87836581550f7ca786edf845bb8430ac8 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Fri, 2 Feb 2018 15:35:05 -0600
Subject: add ImageProxyOptions to default.json (#8193)

---
 config/default.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/default.json')

diff --git a/config/default.json b/config/default.json
index e0fda74cd..0c07f9793 100644
--- a/config/default.json
+++ b/config/default.json
@@ -59,6 +59,7 @@
         "ExperimentalEnableDefaultChannelLeaveJoinMessages": true,
         "ExperimentalGroupUnreadChannels": false,
         "ImageProxyType": "",
+        "ImageProxyOptions": "",
         "ImageProxyURL": ""
     },
     "TeamSettings": {
-- 
cgit v1.2.3-1-g7c22