summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@blessing.io>2015-09-15 20:36:32 +0000
committerDrew Blessing <drew@blessing.io>2015-09-15 20:36:32 +0000
commit0ad669bb5ba08d012d3daa50b51a3a6b069e3e83 (patch)
treeb7cae70e3cdeb847b5e62238f3557038467ff952
parent400b3d26b3867df8910d05bb986f93ac0a3bf206 (diff)
parent34e1ce130f829605fc6ba34bc12ea7e0412d9bba (diff)
downloadgitlab-ce-0ad669bb5ba08d012d3daa50b51a3a6b069e3e83.tar.gz
Merge branch 'slack-help-text' into 'master'
Add a help text to the Slack Service When setting up the service I was not sure which webhook I should use, by adding this Help text I hope we can help people in the future with setting up this hook See merge request !1302
-rw-r--r--app/models/project_services/slack_service.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 36d9874edd3..7cd5e892507 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -34,6 +34,12 @@ class SlackService < Service
'slack'
end
+ def help
+ 'This service sends notifications to your Slack channel.<br/>
+ To setup this Service you need to create a new <b>"Incoming webhook"</b> in your Slack integration panel,
+ and enter the Webhook URL below.'
+ end
+
def fields
[
{ type: 'text', name: 'webhook',