From 6cebcead2269579d5534367408e15a44412be7f1 Mon Sep 17 00:00:00 2001 From: Sudheer Date: Wed, 2 Dec 2020 21:44:30 +0530 Subject: [PATCH] MM-27989 Remove experimental setting for data prefetch (#16306) Co-authored-by: Mattermod --- config/client.go | 2 -- model/config.go | 5 ----- services/telemetry/telemetry.go | 1 - 3 files changed, 8 deletions(-) diff --git a/config/client.go b/config/client.go index efeec23cda..846e64d067 100644 --- a/config/client.go +++ b/config/client.go @@ -66,8 +66,6 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies) props["ExperimentalTimezone"] = strconv.FormatBool(*c.DisplaySettings.ExperimentalTimezone) - props["ExperimentalDataPrefetch"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalDataPrefetch) - props["SendEmailNotifications"] = strconv.FormatBool(*c.EmailSettings.SendEmailNotifications) props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications) props["RequireEmailVerification"] = strconv.FormatBool(*c.EmailSettings.RequireEmailVerification) diff --git a/model/config.go b/model/config.go index c37235bb08..35f62567bf 100644 --- a/model/config.go +++ b/model/config.go @@ -333,7 +333,6 @@ type ServiceSettings struct { ExperimentalGroupUnreadChannels *string `access:"experimental"` ExperimentalChannelOrganization *bool `access:"experimental"` ExperimentalChannelSidebarOrganization *string `access:"experimental"` - ExperimentalDataPrefetch *bool `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. @@ -699,10 +698,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { s.ExperimentalChannelSidebarOrganization = NewString("disabled") } - if s.ExperimentalDataPrefetch == nil { - s.ExperimentalDataPrefetch = NewBool(true) - } - if s.DEPRECATED_DO_NOT_USE_ImageProxyType == nil { s.DEPRECATED_DO_NOT_USE_ImageProxyType = NewString("") } diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 7bf477db00..666889beef 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -422,7 +422,6 @@ func (ts *TelemetryService) trackConfig() { "enable_svgs": *cfg.ServiceSettings.EnableSVGs, "enable_latex": *cfg.ServiceSettings.EnableLatex, "enable_opentracing": *cfg.ServiceSettings.EnableOpenTracing, - "experimental_data_prefetch": *cfg.ServiceSettings.ExperimentalDataPrefetch, "enable_local_mode": *cfg.ServiceSettings.EnableLocalMode, "managed_resource_paths": isDefault(*cfg.ServiceSettings.ManagedResourcePaths, ""), })