[MM-30851] Replace ExperimentalChannelSidebarOrganization with EnableLegacySidebar (#16529)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Devin Binnie
2021-01-18 10:15:31 -05:00
коммит произвёл GitHub
родитель caeda90b24
Коммит 95ee824c8b
3 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@@ -338,7 +338,6 @@ type ServiceSettings struct {
ExperimentalEnableDefaultChannelLeaveJoinMessages *bool `access:"experimental"`
ExperimentalGroupUnreadChannels *string `access:"experimental"`
ExperimentalChannelOrganization *bool `access:"experimental"`
ExperimentalChannelSidebarOrganization *string `access:"experimental"`
DEPRECATED_DO_NOT_USE_ImageProxyType *string `json:"ImageProxyType" mapstructure:"ImageProxyType"` // This field is deprecated and must not be used.
DEPRECATED_DO_NOT_USE_ImageProxyURL *string `json:"ImageProxyURL" mapstructure:"ImageProxyURL"` // This field is deprecated and must not be used.
DEPRECATED_DO_NOT_USE_ImageProxyOptions *string `json:"ImageProxyOptions" mapstructure:"ImageProxyOptions"` // This field is deprecated and must not be used.
@@ -362,6 +361,7 @@ type ServiceSettings struct {
ThreadAutoFollow *bool `access:"experimental"`
CollapsedThreads *string `access:"experimental"`
ManagedResourcePaths *string `access:"environment,write_restrictable,cloud_restrictable"`
EnableLegacySidebar *bool `access:"experimental"`
}
func (s *ServiceSettings) SetDefaults(isUpdate bool) {
@@ -700,10 +700,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
s.ExperimentalChannelOrganization = NewBool(experimentalUnreadEnabled)
}
if s.ExperimentalChannelSidebarOrganization == nil {
s.ExperimentalChannelSidebarOrganization = NewString("disabled")
}
if s.DEPRECATED_DO_NOT_USE_ImageProxyType == nil {
s.DEPRECATED_DO_NOT_USE_ImageProxyType = NewString("")
}
@@ -799,6 +795,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
if s.ManagedResourcePaths == nil {
s.ManagedResourcePaths = NewString("")
}
if s.EnableLegacySidebar == nil {
s.EnableLegacySidebar = NewBool(false)
}
}
type ClusterSettings struct {