diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-21 20:38:31 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-21 20:38:31 -0700 |
commit | afcff9b301ed45687ab7021709af8b2cf338355b (patch) | |
tree | 55f8c51b6c012e5663b77bd88e202f4aa21a3d9c /utils | |
parent | e78c79b83213efc40bffc5ef42071fedb85d6061 (diff) | |
download | chat-afcff9b301ed45687ab7021709af8b2cf338355b.tar.gz chat-afcff9b301ed45687ab7021709af8b2cf338355b.tar.bz2 chat-afcff9b301ed45687ab7021709af8b2cf338355b.zip |
Fixing unit tests
Diffstat (limited to 'utils')
-rw-r--r-- | utils/config.go | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/utils/config.go b/utils/config.go index 5b7cc7c64..66a20c39b 100644 --- a/utils/config.go +++ b/utils/config.go @@ -183,7 +183,7 @@ func getClientProperties(c *model.Config) map[string]string { props["AllowSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.AllowSignUpWithEmail) props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail - props["AllowSignUpWithGitLab"] = strconv.FormatBool(false) + props["AllowSignUpWithGitLab"] = strconv.FormatBool(c.GitLabSSOSettings.Allow) props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress) props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink) @@ -194,25 +194,3 @@ func getClientProperties(c *model.Config) map[string]string { return props } - -// func IsS3Configured() bool { -// if Cfg.AWSSettings.AmazonS3AccessKeyId == "" || Cfg.AWSSettingsAmazonS3SecretAccessKey == "" || Cfg.AWSSettingsAmazonS3Region == "" || Cfg.AWSSettingsAmazonS3Bucket == "" { -// return false -// } - -// return true -// } - -func IsServiceAllowed(s string) bool { - if len(s) == 0 { - return false - } - - if service, ok := Cfg.SSOSettings[s]; ok { - if service.Allow { - return true - } - } - - return false -} |