summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-14 07:46:35 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-14 07:46:35 -0400
commit5e14ef6084dfbdf401f81ae97f35e5b1000f11ca (patch)
treee93364dcb32aad93fa03afafc21530e80edff87c /web/react/components/user_settings
parent2bbe8f48f76e3f0ee4bc1a019ba1fa2e685e148a (diff)
parentac0f8f6bcf9eb65b2541d537ef8960f0b5d3f0ff (diff)
downloadchat-5e14ef6084dfbdf401f81ae97f35e5b1000f11ca.tar.gz
chat-5e14ef6084dfbdf401f81ae97f35e5b1000f11ca.tar.bz2
chat-5e14ef6084dfbdf401f81ae97f35e5b1000f11ca.zip
Merge pull request #1041 from mattermost/plt-603
RC3 - PLT-603 Fix webhook name not overriding in RHS and update webhook help text.
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/manage_incoming_hooks.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index 8817e0d39..f5a2774a0 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -148,7 +148,8 @@ export default class ManageIncomingHooks extends React.Component {
return (
<div key='addIncomingHook'>
- {'For developers building integrations this page lets you create webhook URLs for channels and private groups. Please see http://mattermost.org/webhooks to learn about creating webhooks, view samples, and to let the community know about integrations you have built. The URLs created below can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'}
+ {'Create webhook URLs for use in external integrations. Please see '}<a href='http://mattermost.org/webhooks'>{'http://mattermost.org/webhooks'}</a> {' to learn more.'}
+ <br/>
<br/>
<label className='control-label'>{'Add a new incoming webhook'}</label>
<div className='padding-top'>