Commit 7326c62d authored by Mike Greiling's avatar Mike Greiling

Merge branch 'updating-slack-config-helptext' into 'master'

Updates helptext in slack notifications config page

See merge request gitlab-org/gitlab!34727
parents aba3b471 a88e6f92
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.info-well .info-well
.well-segment .well-segment
%p= s_('SlackIntegration|This service send notifications about projects\' events to Slack channels. To set up this service:') %p= s_('SlackIntegration|This service sends notifications about project events to Slack channels. To set up this service:')
%ol %ol
%li %li
= html_escape(s_('SlackIntegration|%{webhooks_link_start}Add an incoming webhook%{webhooks_link_end} in your Slack team. The default channel can be overridden for each event.')) % { webhooks_link_start: webhooks_link_start.html_safe, webhooks_link_end: '</a>'.html_safe } = html_escape(s_('SlackIntegration|%{webhooks_link_start}Add an incoming webhook%{webhooks_link_end} in your Slack team. The default channel can be overridden for each event.')) % { webhooks_link_start: webhooks_link_start.html_safe, webhooks_link_end: '</a>'.html_safe }
......
...@@ -22486,7 +22486,7 @@ msgstr "" ...@@ -22486,7 +22486,7 @@ msgstr ""
msgid "SlackIntegration|Select events below to enable notifications. The %{strong_open}Slack channel names%{strong_close} and %{strong_open}Slack username%{strong_close} fields are optional." msgid "SlackIntegration|Select events below to enable notifications. The %{strong_open}Slack channel names%{strong_close} and %{strong_open}Slack username%{strong_close} fields are optional."
msgstr "" msgstr ""
msgid "SlackIntegration|This service send notifications about projects' events to Slack channels. To set up this service:" msgid "SlackIntegration|This service sends notifications about project events to Slack channels. To set up this service:"
msgstr "" msgstr ""
msgid "SlackService|2. Paste the %{strong_open}Token%{strong_close} into the field below" msgid "SlackService|2. Paste the %{strong_open}Token%{strong_close} into the field below"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment