summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/saml.go6
-rw-r--r--webapp/yarn.lock2
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"