summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-05-04 11:11:28 -0700
committerChristopher Speller <crspeller@gmail.com>2017-05-04 14:11:28 -0400
commit4f074fed0d653a28779ac586e418341232d43e95 (patch)
tree8598c8920f460a81f6fd2a8da05bfc86abc31e45 /webapp/components/admin_console
parent152bc14fcb7c276fbf053c9f70921ad7f8180167 (diff)
downloadchat-4f074fed0d653a28779ac586e418341232d43e95.tar.gz
chat-4f074fed0d653a28779ac586e418341232d43e95.tar.bz2
chat-4f074fed0d653a28779ac586e418341232d43e95.zip
PLT-6444 switching SAML props to default true (#6330)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/saml_settings.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index 0754747d9..a02ab4a8a 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -368,7 +368,7 @@ export default class SamlSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.saml.verifyDescription'
- defaultMessage='When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL'
+ defaultMessage='When false, Mattermost will not verify that the signature sent from a SAML Response matches the Service Provider Login URL. Not recommended for production environments. For testing only.'
/>
}
value={this.state.verify}
@@ -405,7 +405,7 @@ export default class SamlSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.saml.encryptDescription'
- defaultMessage='When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.'
+ defaultMessage='When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.'
/>
}
value={this.state.encrypt}