MM-17767: Remove ExperimentalLdapGroupSync config. (#12388)

Этот коммит содержится в:
Martin Kraft
2019-10-08 08:03:39 -04:00
коммит произвёл GitHub
родитель 488ae1abad
Коммит 598f7c7255
3 изменённых файлов: 0 добавлений и 7 удалений

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

@@ -296,7 +296,6 @@ func (a *App) trackConfig() {
"experimental_strict_csrf_enforcement": *cfg.ServiceSettings.ExperimentalStrictCSRFEnforcement, "experimental_strict_csrf_enforcement": *cfg.ServiceSettings.ExperimentalStrictCSRFEnforcement,
"enable_email_invitations": *cfg.ServiceSettings.EnableEmailInvitations, "enable_email_invitations": *cfg.ServiceSettings.EnableEmailInvitations,
"experimental_channel_organization": *cfg.ServiceSettings.ExperimentalChannelOrganization, "experimental_channel_organization": *cfg.ServiceSettings.ExperimentalChannelOrganization,
"experimental_ldap_group_sync": *cfg.ServiceSettings.ExperimentalLdapGroupSync,
"disable_bots_when_owner_is_deactivated": *cfg.ServiceSettings.DisableBotsWhenOwnerIsDeactivated, "disable_bots_when_owner_is_deactivated": *cfg.ServiceSettings.DisableBotsWhenOwnerIsDeactivated,
"enable_bot_account_creation": *cfg.ServiceSettings.EnableBotAccountCreation, "enable_bot_account_creation": *cfg.ServiceSettings.EnableBotAccountCreation,
"enable_svgs": *cfg.ServiceSettings.EnableSVGs, "enable_svgs": *cfg.ServiceSettings.EnableSVGs,

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

@@ -320,7 +320,6 @@ type ServiceSettings struct {
DisableLegacyMFA *bool `restricted:"true"` DisableLegacyMFA *bool `restricted:"true"`
ExperimentalStrictCSRFEnforcement *bool `restricted:"true"` ExperimentalStrictCSRFEnforcement *bool `restricted:"true"`
EnableEmailInvitations *bool EnableEmailInvitations *bool
ExperimentalLdapGroupSync *bool
DisableBotsWhenOwnerIsDeactivated *bool `restricted:"true"` DisableBotsWhenOwnerIsDeactivated *bool `restricted:"true"`
EnableBotAccountCreation *bool EnableBotAccountCreation *bool
EnableSVGs *bool EnableSVGs *bool
@@ -669,10 +668,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
s.DisableLegacyMFA = NewBool(!isUpdate) s.DisableLegacyMFA = NewBool(!isUpdate)
} }
if s.ExperimentalLdapGroupSync == nil {
s.ExperimentalLdapGroupSync = NewBool(false)
}
if s.ExperimentalStrictCSRFEnforcement == nil { if s.ExperimentalStrictCSRFEnforcement == nil {
s.ExperimentalStrictCSRFEnforcement = NewBool(false) s.ExperimentalStrictCSRFEnforcement = NewBool(false)
} }

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

@@ -65,7 +65,6 @@
"ImageProxyOptions": "", "ImageProxyOptions": "",
"EnableAPITeamDeletion": false, "EnableAPITeamDeletion": false,
"ExperimentalEnableHardenedMode": false, "ExperimentalEnableHardenedMode": false,
"ExperimentalLdapGroupSync": true
}, },
"TeamSettings": { "TeamSettings": {
"SiteName": "Mattermost", "SiteName": "Mattermost",