diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 12:10:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 12:10:16 +0300 |
commit | acad0870f7fd0cfe163a9d3a248a4a3eb8ca343d (patch) | |
tree | afc7b07db38fbc23a5becced3244776578b01d55 /doc/user/project/integrations | |
parent | ccb37f9759b534764404b50e31daf8c18e6def91 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/integrations')
-rw-r--r-- | doc/user/project/integrations/img/slack_setup.png | bin | 23401 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/integrations/index.md | 6 | ||||
-rw-r--r-- | doc/user/project/integrations/slack_slash_commands.md | 30 | ||||
-rw-r--r-- | doc/user/project/integrations/webhooks.md | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/doc/user/project/integrations/img/slack_setup.png b/doc/user/project/integrations/img/slack_setup.png Binary files differdeleted file mode 100644 index d8aedf84be5..00000000000 --- a/doc/user/project/integrations/img/slack_setup.png +++ /dev/null diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md index fd59f54a066..36528a52dbe 100644 --- a/doc/user/project/integrations/index.md +++ b/doc/user/project/integrations/index.md @@ -75,16 +75,16 @@ You can configure the following integrations. | [Pumble](pumble.md) | Send event notifications to a Pumble channel. | **{dotted-circle}** No | | Pushover | Get real-time notifications on your device. | **{dotted-circle}** No | | [Redmine](redmine.md) | Use Redmine as the issue tracker. | **{dotted-circle}** No | -| [Shimo Workspace](shimo.md) | Use Shimo instead of the GitLab Wiki. | **{dotted-circle}** No | +| [Shimo](shimo.md) (deprecated) | Use Shimo instead of the GitLab Wiki. | **{dotted-circle}** No | | [GitLab for Slack app](gitlab_slack_application.md) | Use Slack's official GitLab application. | **{dotted-circle}** No | -| [Slack notifications](slack.md) | Send notifications about project events to Slack. | **{dotted-circle}** No | +| [Slack notifications](slack.md) (deprecated) | Send notifications about project events to Slack. | **{dotted-circle}** No | | [Slack slash commands](slack_slash_commands.md) | Enable slash commands in a workspace. | **{dotted-circle}** No | | [Squash TM](squash_tm.md) | Update Squash TM requirements when GitLab issues are modified. | **{check-circle}** Yes | | [Telegram](telegram.md) | Send notifications about project events to Telegram. | **{dotted-circle}** No | | [Unify Circuit](unify_circuit.md) | Send notifications about project events to Unify Circuit. | **{dotted-circle}** No | | [Webex Teams](webex_teams.md) | Receive events notifications. | **{dotted-circle}** No | | [YouTrack](youtrack.md) | Use YouTrack as the issue tracker. | **{dotted-circle}** No | -| [ZenTao](zentao.md) | Use ZenTao as the issue tracker. | **{dotted-circle}** No | +| [ZenTao](zentao.md) (deprecated) | Use ZenTao as the issue tracker. | **{dotted-circle}** No | ### Project webhooks diff --git a/doc/user/project/integrations/slack_slash_commands.md b/doc/user/project/integrations/slack_slash_commands.md index c1e04f2aa63..78c8180cb4c 100644 --- a/doc/user/project/integrations/slack_slash_commands.md +++ b/doc/user/project/integrations/slack_slash_commands.md @@ -12,10 +12,10 @@ For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) inst You can use [slash commands](gitlab_slack_application.md#slash-commands) to run common GitLab operations, like creating an issue, from a [Slack](https://slack.com/) chat environment. -To use slash commands in Slack, you must configure both Slack and GitLab. +To run slash commands in Slack, you must configure both Slack and GitLab. -GitLab can also send events (such as `issue created`) to Slack as part of the -separately configured [Slack notifications](slack.md). +GitLab can also send events (such as `issue created`) to Slack as part of +[Slack notifications](gitlab_slack_application.md#slack-notifications). For a list of available slash commands, see [Slash commands](gitlab_slack_application.md#slash-commands). @@ -25,15 +25,15 @@ Slack slash commands are scoped to a project. To configure Slack slash commands: 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project. 1. Select **Settings > Integrations**. -1. Select **Slack slash commands**. Leave this browser tab open. -1. Open a new browser tab, sign in to your Slack team, and [start a new Slash Commands integration](https://my.slack.com/services/new/slash-commands). -1. Enter a trigger command. We suggest you use the project name. - Select **Add Slash Command Integration**. -1. Complete the rest of the fields in the Slack configuration page using information from the GitLab browser tab. - In particular, make sure you copy and paste the **URL**. - - ![Slack setup instructions](img/slack_setup.png) - -1. On the Slack configuration page, select **Save Integration** and copy the **Token**. -1. Go back to the GitLab configuration page and paste in the **Token**. -1. Ensure the **Active** checkbox is selected and select **Save changes**. +1. Select **Slack slash commands** and leave this browser tab open. +1. In a new browser tab, sign in to Slack and [add a new slash command](https://my.slack.com/services/new/slash-commands). +1. Enter a slash command trigger name. You could use the project name. +1. Select **Add Slash Command Integration**. +1. In the Slack browser tab: + 1. Complete the fields with information from the GitLab browser tab. + 1. Select **Save Integration** and copy the **Token** value. +1. In the GitLab browser tab: + 1. Paste the token and ensure the **Active** checkbox is selected. + 1. Select **Save changes**. + +You can now run slash commands in Slack. diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 9f24f3b49ff..867193f42f6 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -28,7 +28,7 @@ listens for specific [events](#events) and GitLab sends a POST request with data Usually, you set up your own [webhook receiver](#create-an-example-webhook-receiver) to receive information from GitLab and send it to another app, according to your requirements. -We have a [built-in receiver](slack.md) +We have a [built-in receiver](gitlab_slack_application.md#slack-notifications) for sending [Slack](https://api.slack.com/incoming-webhooks) notifications per project. GitLab.com enforces [webhook limits](../../../user/gitlab_com/index.md#webhooks), |