summaryrefslogtreecommitdiffstats
path: root/model/license.go
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2018-05-23 20:36:20 +0800
committerGitHub <noreply@github.com>2018-05-23 20:36:20 +0800
commit70a118c0fd45f8ab2510c80a0110f24be21f8785 (patch)
tree9289aa8881b83bf533fda2b6b56453c49af72d12 /model/license.go
parentce378adc97399dcae9e1c9621c584669b813b2d2 (diff)
downloadchat-70a118c0fd45f8ab2510c80a0110f24be21f8785.tar.gz
chat-70a118c0fd45f8ab2510c80a0110f24be21f8785.tar.bz2
chat-70a118c0fd45f8ab2510c80a0110f24be21f8785.zip
remove license check when enforcing password requirements (#8840)
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
Diffstat (limited to 'model/license.go')
-rw-r--r--model/license.go6
1 files changed, 0 insertions, 6 deletions
diff --git a/model/license.go b/model/license.go
index 942a18d55..b69c13c54 100644
--- a/model/license.go
+++ b/model/license.go
@@ -49,7 +49,6 @@ type Features struct {
CustomBrand *bool `json:"custom_brand"`
MHPNS *bool `json:"mhpns"`
SAML *bool `json:"saml"`
- PasswordRequirements *bool `json:"password_requirements"`
Elasticsearch *bool `json:"elastic_search"`
Announcement *bool `json:"announcement"`
ThemeManagement *bool `json:"theme_management"`
@@ -73,7 +72,6 @@ func (f *Features) ToMap() map[string]interface{} {
"custom_brand": *f.CustomBrand,
"mhpns": *f.MHPNS,
"saml": *f.SAML,
- "password": *f.PasswordRequirements,
"elastic_search": *f.Elasticsearch,
"email_notification_contents": *f.EmailNotificationContents,
"data_retention": *f.DataRetention,
@@ -131,10 +129,6 @@ func (f *Features) SetDefaults() {
f.SAML = NewBool(*f.FutureFeatures)
}
- if f.PasswordRequirements == nil {
- f.PasswordRequirements = NewBool(*f.FutureFeatures)
- }
-
if f.Elasticsearch == nil {
f.Elasticsearch = NewBool(*f.FutureFeatures)
}