summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorThomas Balthazar <tbalthazar@users.noreply.github.com>2016-07-05 21:37:21 +0200
committerHarrison Healey <harrisonmhealey@gmail.com>2016-07-05 15:37:21 -0400
commitf4dd8e579639637057e8717067bb0627d9eb1de3 (patch)
tree7c5795636c052e35849df95a07778bae38f54969 /utils
parent71bd413b257afd376e1e6fb4c229f70bdb9381c1 (diff)
downloadchat-f4dd8e579639637057e8717067bb0627d9eb1de3.tar.gz
chat-f4dd8e579639637057e8717067bb0627d9eb1de3.tar.bz2
chat-f4dd8e579639637057e8717067bb0627d9eb1de3.zip
PLT-1316/PLT-3280 Change client-side max file size limit (#3354)
* Change client-side max file size limit It now relies on the value set in config.json. Re-enable and tweak the max file size setting in system console. * Update file upload error message
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 5ebf29e3e..922709786 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -256,6 +256,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["EnableCustomEmoji"] = strconv.FormatBool(*c.ServiceSettings.EnableCustomEmoji)
props["RestrictCustomEmojiCreation"] = *c.ServiceSettings.RestrictCustomEmojiCreation
+ props["MaxFileSize"] = strconv.FormatInt(*c.FileSettings.MaxFileSize, 10)
if IsLicensed {
if *License.Features.CustomBrand {