diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
| commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
| tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/components/admin_console/saml_settings.jsx | |
| parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
| parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
| download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip | |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/components/admin_console/saml_settings.jsx')
| -rw-r--r-- | webapp/components/admin_console/saml_settings.jsx | 4 |
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 1391df0b6..ad7a82553 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -296,9 +296,9 @@ export default class SamlSettings extends AdminSettings { <SettingsGroup> <div className='banner'> <div className='banner__content'> - <FormattedMessage + <FormattedHTMLMessage id='admin.saml.bannerDesc' - defaultMessage='If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.' + defaultMessage='User attributes in SAML server, including user deactivation or removal, are updated in Mattermost during user login. Learn more at: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>' /> </div> </div> |