From 9677a9f71777d75f3def0b0cb238050a30ec6a67 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Wed, 29 Jul 2015 01:26:10 -0800
Subject: Fixes mm-1355 adds rate limiting apis

---
 config/config.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index cfb3c2de8..40bb41e63 100644
--- a/config/config.json
+++ b/config/config.json
@@ -21,7 +21,8 @@
         "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
         "AnalyticsUrl": "",
         "UseLocalStorage": true,
-        "StorageDirectory": "./data/"
+        "StorageDirectory": "./data/",
+        "AllowedLoginAttempts": 3
     },
     "SSOSettings": {
         "gitlab": {
@@ -68,6 +69,13 @@
         "ApplePushCertPublic": "",
         "ApplePushCertPrivate": ""
     },
+    "RateLimitSettings": {
+        "UseRateLimiter": true,
+        "PerSec": 10,
+        "MemoryStoreSize": 10000,
+        "VaryByRemoteAddr": true,
+        "VaryByHeader": ""
+    },
     "PrivacySettings": {
         "ShowEmailAddress": true,
         "ShowPhoneNumber": true,
-- 
cgit v1.2.3-1-g7c22


From b4877c5d36569dae486a1e53f39c35d346e3d3d2 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 30 Jul 2015 00:46:17 -0800
Subject: Fixing code review feedback

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

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index 40bb41e63..121d5b3a4 100644
--- a/config/config.json
+++ b/config/config.json
@@ -22,7 +22,7 @@
         "AnalyticsUrl": "",
         "UseLocalStorage": true,
         "StorageDirectory": "./data/",
-        "AllowedLoginAttempts": 3
+        "AllowedLoginAttempts": 10
     },
     "SSOSettings": {
         "gitlab": {
-- 
cgit v1.2.3-1-g7c22


From a541f09380ab2adbe4d0ba7c80ff72015767bd81 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 29 Jul 2015 10:09:11 -0400
Subject: image thumbnails now scale appropriately so there is no whitespace,
 also generalized some thumbnail loading code

---
 config/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index a1e73eb03..10a8b6553 100644
--- a/config/config.json
+++ b/config/config.json
@@ -49,8 +49,8 @@
         "S3Region": ""
     },
     "ImageSettings": {
-        "ThumbnailWidth": 200,
-        "ThumbnailHeight": 0,
+        "ThumbnailWidth": 120,
+        "ThumbnailHeight": 100,
         "PreviewWidth": 1024,
         "PreviewHeight": 0,
         "ProfileWidth": 128,
-- 
cgit v1.2.3-1-g7c22