summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-11-05 14:47:23 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-11-05 14:47:23 +1100
commit23d70b8e98982b82877314f4f923eddbe1b0c1eb (patch)
treecee3c5e0fd478d70ebb705e0e96812977948899a
parent0ba3d1411f976afd62fcd6735b62c427e9b24a86 (diff)
downloadgitlab-ce-23d70b8e98982b82877314f4f923eddbe1b0c1eb.tar.gz
Update docs after docs review
-rw-r--r--doc/user/project/integrations/discord_notifications.md27
1 files changed, 13 insertions, 14 deletions
diff --git a/doc/user/project/integrations/discord_notifications.md b/doc/user/project/integrations/discord_notifications.md
index 99b52d7aa17..ed04a334058 100644
--- a/doc/user/project/integrations/discord_notifications.md
+++ b/doc/user/project/integrations/discord_notifications.md
@@ -2,29 +2,28 @@
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22684) in GitLab 11.5.
-The Discord Notifications service sends notifications from GitLab to the channel for which the webhook was created.
+The Discord Notifications service sends event notifications from GitLab to the channel for which the webhook was created.
-## On Discord
+## Create webhook
-1. Open the channel in which you want to see the notifications.
+1. Open the Discord channel you want to receive GitLab event notifications.
1. From the channel menu, select **Edit channel**.
1. Click on **Webhooks** menu item.
-1. Click on **Create Webhook** and fill in the name of the bot that will post the messages. Optionally define avatar.
-1. Copy the **WEBHOOK URL** of your webhook and click **Save**.
+1. Click the **Create Webhook** button and fill in the name of the bot that will post the messages. Optionally, edit the avatar.
+1. Note the URL from the **WEBHOOK URL** field.
+1. Click the **Save** button.
-See also [Intro to Webhooks](https://support.discordapp.com/hc/en-us/articles/228383668-Intro-to-Webhooks) article.
+## Configure created webhook in GitLab
-## On GitLab
+With the webhook URL created in the Discord channel, you can set up the Discord Notifications service in GitLab.
-When you have the **Webhook URL** for your Discord Notifications channel webhook, you can set up the GitLab service.
-
-1. Navigate to the [Integrations page](project_services.md#accessing-the-project-services) in your project's settings, i.e. **Project > Settings > Integrations**.
+1. Navigate to the [Integrations page](project_services.md#accessing-the-project-services) in your project's settings. That is, **Project > Settings > Integrations**.
1. Select the **Discord Notifications** project service to configure it.
1. Check the **Active** checkbox to turn on the service.
-1. Check the checkboxes corresponding to the GitLab events you want to receive.
-1. Paste the **Webhook URL** that you copied from the Discord Notifications configuration step.
-1. Configure the remaining options and click `Save changes`.
+1. Check the checkboxes corresponding to the GitLab events you want to send notifications for to Discord.
+1. Paste the webhook URL that you copied from the create Discord webhook step.
+1. Configure the remaining options and click the **Save changes** button.
-Your Discord Notifications channel will now start receiving GitLab event notifications as configured.
+The Discord channel you created the webhook for will now receive notification of the GitLab events as configured.
![Discord configuration](img/discord_notifications_configuration.png)