summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2016-10-11 08:44:46 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-10-11 08:44:46 -0400
commitfe1503d9e74cb7e8cd04aeb302747aa01745e5bb (patch)
treea05a5f7aad31157c2d19aabc8234ac9bb696d7e7 /webapp/components
parent7fb818d4cef09dd74f9fcfd99381a7c0e7064a56 (diff)
downloadchat-fe1503d9e74cb7e8cd04aeb302747aa01745e5bb.tar.gz
chat-fe1503d9e74cb7e8cd04aeb302747aa01745e5bb.tar.bz2
chat-fe1503d9e74cb7e8cd04aeb302747aa01745e5bb.zip
Add text banner to SAML System Console settings (#4195)
* Update saml_settings.jsx * Update en.json * Text tweak * Fix build error * Use classnames in saml_settings.jsx to fix build errors
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/saml_settings.jsx10
1 files changed, 9 insertions, 1 deletions
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index fe8acaf16..c7cd73399 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -292,6 +292,14 @@ export default class SamlSettings extends AdminSettings {
return (
<SettingsGroup>
+ <div className='banner'>
+ <div className='banner__content'>
+ <FormattedMessage
+ 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.'
+ />
+ </div>
+ </div>
<BooleanSetting
id='enable'
label={
@@ -541,4 +549,4 @@ export default class SamlSettings extends AdminSettings {
</SettingsGroup>
);
}
-} \ No newline at end of file
+}