summaryrefslogtreecommitdiff
path: root/doc/user/project/integrations
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-16 16:32:53 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-06-16 16:32:53 +0000
commit352a9ed56213b6f83a679e72f9554638a0aed1ee (patch)
tree04ac45d05a67dfd71ff325ed45c8ffacaf9ec23b /doc/user/project/integrations
parentc6701d45474acab6a2d687d2e2ffdaac5c0d5491 (diff)
parentea090291bba6bb665b3631cc5a2659e6673a6959 (diff)
downloadgitlab-ce-352a9ed56213b6f83a679e72f9554638a0aed1ee.tar.gz
Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'
Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
Diffstat (limited to 'doc/user/project/integrations')
-rw-r--r--doc/user/project/integrations/slack_slash_commands.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/integrations/slack_slash_commands.md b/doc/user/project/integrations/slack_slash_commands.md
index 54e0ee611cb..c267da69bb3 100644
--- a/doc/user/project/integrations/slack_slash_commands.md
+++ b/doc/user/project/integrations/slack_slash_commands.md
@@ -2,7 +2,7 @@
> Introduced in GitLab 8.15
-Slack slash commands (also known as chat commmands) allow you to control GitLab and view content right inside Slack, without having to leave it. This requires configurations in both Slack and GitLab.
+Slack slash commands allow you to control GitLab and view content right inside Slack, without having to leave it. This requires configurations in both Slack and GitLab.
> Note: GitLab can also send events (e.g. issue created) to Slack as notifications. This is the separately configured [Slack Notifications Service](slack.md).
@@ -20,4 +20,4 @@ Slack slash commands (also known as chat commmands) allow you to control GitLab
## Usage
-You can now use the [Slack slash commands](../../../integration/chat_commands.md). \ No newline at end of file
+You can now use the [Slack slash commands](../../../integration/slash_commands.md).