From 78d853212bf1042b0211ee8846ad5c5a4a637e76 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Thu, 4 Aug 2016 21:31:42 +0000 Subject: Bumping version to: 3.3.0-rc1 --- model/version.go | 1 + 1 file changed, 1 insertion(+) (limited to 'model') diff --git a/model/version.go b/model/version.go index c6f49525b..49e8af048 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "3.3.0", "3.2.0", "3.1.0", "3.0.0", -- cgit v1.2.3-1-g7c22 From 86824cdf39975b618c525468ed1e845207be6967 Mon Sep 17 00:00:00 2001 From: enahum Date: Mon, 8 Aug 2016 14:30:33 -0500 Subject: PLT-3849 Fix No error message when invalid SAML SSO URL entered in System Console (#3763) --- model/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'model') diff --git a/model/config.go b/model/config.go index 7fe575e58..61d13360c 100644 --- a/model/config.go +++ b/model/config.go @@ -1001,7 +1001,7 @@ func (o *Config) IsValid() *AppError { } if *o.SamlSettings.Enable { - if len(*o.SamlSettings.IdpUrl) == 0 || !IsValidHttpUrl(*o.SamlSettings.IdpDescriptorUrl) { + if len(*o.SamlSettings.IdpUrl) == 0 || !IsValidHttpUrl(*o.SamlSettings.IdpUrl) { return NewLocAppError("Config.IsValid", "model.config.is_valid.saml_idp_url.app_error", nil, "") } -- cgit v1.2.3-1-g7c22