summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorS4KH <kh.syerikjan@gmail.com>2016-10-21 20:36:13 +0800
committerChristopher Speller <crspeller@gmail.com>2016-10-21 08:36:13 -0400
commit234958e0076655efd8a58ea4502edce3226418ed (patch)
tree568c2e2f06a6921414e2cded9cb682651768aee8 /config
parentd13ba8c55c981978f3b962c6991f478b36bf8a8b (diff)
downloadchat-234958e0076655efd8a58ea4502edce3226418ed.tar.gz
chat-234958e0076655efd8a58ea4502edce3226418ed.tar.bz2
chat-234958e0076655efd8a58ea4502edce3226418ed.zip
HW 4139: Make channel limits configurable in the System Console (#4154)
* Auto Changes * 4139 Made channel limits configurable in the System Console as described in the issue * Removed error message entries from other locales, made maxChannelsPerteam type to pointer * Added * symbol to maxChannelsPerTeam inside isValid function * Update team_test.go * Restored to old test * Checked maximum number channels per team when creating channel * Fixed code to pass api/channel_test.go * Reverted changes on config except MaxChannelsPerTeam * Update channel.go * Ran gofmt -w . * Reverted vendor directoy
Diffstat (limited to 'config')
-rw-r--r--config/config.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index bbdb8d160..02e300897 100644
--- a/config/config.json
+++ b/config/config.json
@@ -51,7 +51,8 @@
"RestrictTeamInvite": "all",
"RestrictPublicChannelManagement": "all",
"RestrictPrivateChannelManagement": "all",
- "UserStatusAwayTimeout": 300
+ "UserStatusAwayTimeout": 300,
+ "MaxChannelsPerTeam": 2000
},
"SqlSettings": {
"DriverName": "mysql",