From 4cc2c914e634eb8c79eb61aa1bc29faf6021ffcf Mon Sep 17 00:00:00 2001 From: Wim Date: Sun, 22 Nov 2020 15:55:57 +0100 Subject: Update vendor (#1297) --- .../mattermost/mattermost-server/v5/model/config.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'vendor/github.com/mattermost/mattermost-server/v5/model/config.go') diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/config.go b/vendor/github.com/mattermost/mattermost-server/v5/model/config.go index f50bbf29..42863ead 100644 --- a/vendor/github.com/mattermost/mattermost-server/v5/model/config.go +++ b/vendor/github.com/mattermost/mattermost-server/v5/model/config.go @@ -342,6 +342,9 @@ type ServiceSettings struct { EnableAPIChannelDeletion *bool EnableLocalMode *bool LocalModeSocketLocation *string + EnableAWSMetering *bool + ThreadAutoFollow *bool `access:"experimental"` + ManagedResourcePaths *string `access:"environment,write_restrictable,cloud_restrictable"` } func (s *ServiceSettings) SetDefaults(isUpdate bool) { @@ -755,6 +758,18 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { if s.LocalModeSocketLocation == nil { s.LocalModeSocketLocation = NewString(LOCAL_MODE_SOCKET_PATH) } + + if s.EnableAWSMetering == nil { + s.EnableAWSMetering = NewBool(false) + } + + if s.ThreadAutoFollow == nil { + s.ThreadAutoFollow = NewBool(true) + } + + if s.ManagedResourcePaths == nil { + s.ManagedResourcePaths = NewString("") + } } type ClusterSettings struct { -- cgit v1.2.3