summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hallam <jesse.hallam@gmail.com>2018-09-18 10:53:36 -0400
committerJoram Wilander <jwawilander@gmail.com>2018-09-18 10:53:36 -0400
commit0204c45b7ac308d31c1d4249a2dc92fd44d76aec (patch)
tree2d047cf89c2e9adea2e408968dddb17042ccc3b1
parentc2496911c0f3a0541d768c3d4a16c895bc5408f5 (diff)
downloadchat-0204c45b7ac308d31c1d4249a2dc92fd44d76aec.tar.gz
chat-0204c45b7ac308d31c1d4249a2dc92fd44d76aec.tar.bz2
chat-0204c45b7ac308d31c1d4249a2dc92fd44d76aec.zip
Revert "disable EnablePublicChannelsMaterialization by default (#9418)" (#9427)
This reverts commit 5786b0d6d57b90bbb0c262235dd9d19b497b5fae, now that the feature is safe to enable by default.
-rw-r--r--config/default.json2
-rw-r--r--model/config.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/default.json b/config/default.json
index 96993a9a9..b303365b5 100644
--- a/config/default.json
+++ b/config/default.json
@@ -131,7 +131,7 @@
"Trace": false,
"AtRestEncryptKey": "",
"QueryTimeout": 30,
- "EnablePublicChannelsMaterialization": false
+ "EnablePublicChannelsMaterialization": true
},
"LogSettings": {
"EnableConsole": true,
diff --git a/model/config.go b/model/config.go
index 7aef548ed..db3030170 100644
--- a/model/config.go
+++ b/model/config.go
@@ -687,7 +687,7 @@ func (s *SqlSettings) SetDefaults() {
}
if s.EnablePublicChannelsMaterialization == nil {
- s.EnablePublicChannelsMaterialization = NewBool(false)
+ s.EnablePublicChannelsMaterialization = NewBool(true)
}
}