diff --git a/app/diagnostics.go b/app/diagnostics.go index 758b25ace43..bb7fd0fac5e 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -296,7 +296,6 @@ func (a *App) trackConfig() { "experimental_strict_csrf_enforcement": *cfg.ServiceSettings.ExperimentalStrictCSRFEnforcement, "enable_email_invitations": *cfg.ServiceSettings.EnableEmailInvitations, "experimental_channel_organization": *cfg.ServiceSettings.ExperimentalChannelOrganization, - "experimental_ldap_group_sync": *cfg.ServiceSettings.ExperimentalLdapGroupSync, "disable_bots_when_owner_is_deactivated": *cfg.ServiceSettings.DisableBotsWhenOwnerIsDeactivated, "enable_bot_account_creation": *cfg.ServiceSettings.EnableBotAccountCreation, "enable_svgs": *cfg.ServiceSettings.EnableSVGs, diff --git a/model/config.go b/model/config.go index acbd3d6f601..81e594f03de 100644 --- a/model/config.go +++ b/model/config.go @@ -320,7 +320,6 @@ type ServiceSettings struct { DisableLegacyMFA *bool `restricted:"true"` ExperimentalStrictCSRFEnforcement *bool `restricted:"true"` EnableEmailInvitations *bool - ExperimentalLdapGroupSync *bool DisableBotsWhenOwnerIsDeactivated *bool `restricted:"true"` EnableBotAccountCreation *bool EnableSVGs *bool @@ -669,10 +668,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { s.DisableLegacyMFA = NewBool(!isUpdate) } - if s.ExperimentalLdapGroupSync == nil { - s.ExperimentalLdapGroupSync = NewBool(false) - } - if s.ExperimentalStrictCSRFEnforcement == nil { s.ExperimentalStrictCSRFEnforcement = NewBool(false) } diff --git a/tests/test-config.json b/tests/test-config.json index a2a7ef3a7c0..64738c872a0 100644 --- a/tests/test-config.json +++ b/tests/test-config.json @@ -65,7 +65,6 @@ "ImageProxyOptions": "", "EnableAPITeamDeletion": false, "ExperimentalEnableHardenedMode": false, - "ExperimentalLdapGroupSync": true }, "TeamSettings": { "SiteName": "Mattermost",