diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-07-17 18:22:49 -0400 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-18 06:22:49 +0800 |
| commit | 3e090162aaac7cbc75900635b800d96e9e9050e3 (patch) | |
| tree | da74e55b79742c3fd1b38976aa5524f437db01f6 | |
| parent | 70bfcfb9d78f2aa07a36d24b092a477ca2b680ef (diff) | |
| download | chat-3e090162aaac7cbc75900635b800d96e9e9050e3.tar.gz chat-3e090162aaac7cbc75900635b800d96e9e9050e3.tar.bz2 chat-3e090162aaac7cbc75900635b800d96e9e9050e3.zip | |
PLT-7126 Do not version detect on saml endpoints and remove config reloading (#6955)
* Do not version detect on saml endpoints and remove config reloading
* Update mattermost-redux
| -rw-r--r-- | app/saml.go | 6 | ||||
| -rw-r--r-- | webapp/yarn.lock | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/saml.go b/app/saml.go index 730e29efc..e5d1e8b3e 100644 --- a/app/saml.go +++ b/app/saml.go @@ -68,7 +68,6 @@ func AddSamlPublicCertificate(fileData *multipart.FileHeader) *model.AppError { } utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) return nil } @@ -88,7 +87,6 @@ func AddSamlPrivateCertificate(fileData *multipart.FileHeader) *model.AppError { } utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) return nil } @@ -108,7 +106,6 @@ func AddSamlIdpCertificate(fileData *multipart.FileHeader) *model.AppError { } utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) return nil } @@ -144,7 +141,6 @@ func RemoveSamlPublicCertificate() *model.AppError { } utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) return nil } @@ -165,7 +161,6 @@ func RemoveSamlPrivateCertificate() *model.AppError { } utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) return nil } @@ -186,7 +181,6 @@ func RemoveSamlIdpCertificate() *model.AppError { } utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) return nil } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 4bde0079e..7583c4312 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -5043,7 +5043,7 @@ math-expression-evaluator@^1.2.14: mattermost-redux@mattermost/mattermost-redux#webapp-4.0: version "0.0.1" - resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/a68c49c57130ed64e5a8fb3bdbd004ced437790b" + resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/ea67cb97d1e34b251e13a356583223284f544aa5" dependencies: deep-equal "1.0.1" harmony-reflect "1.5.1" |