summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-09-01 10:03:55 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-09-01 10:03:55 -0400
commit276e0189b1453b3b869f9ae834482d672b832158 (patch)
treeecac47da72f4954491c108b68b296c244a87c151 /webapp/components/admin_console
parente1e29a86d9f7da84d25fe205287eb0a9e0fecd2d (diff)
downloadchat-276e0189b1453b3b869f9ae834482d672b832158.tar.gz
chat-276e0189b1453b3b869f9ae834482d672b832158.tar.bz2
chat-276e0189b1453b3b869f9ae834482d672b832158.zip
Making LDAP FirstName and LastName fields optional. (#3919)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/ldap_settings.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index 32cdbab3a..23728870e 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -236,7 +236,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.firstnameAttrDesc'
- defaultMessage='The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.'
+ defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.'
/>
}
value={this.state.firstNameAttribute}
@@ -255,7 +255,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.lastnameAttrDesc'
- defaultMessage='The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.'
+ defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.'
/>
}
value={this.state.lastNameAttribute}