diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 06:08:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 06:08:55 +0300 |
commit | 500626a5c953ad81cfc3ed74bf0148c075617e58 (patch) | |
tree | 554e385e0e548f15fc90388da8b73622b803d6f3 /doc/user/project/integrations | |
parent | b133cb2468b412683dbc5f19492d98b2ffa47d09 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/integrations')
-rw-r--r-- | doc/user/project/integrations/irker.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/webhooks.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/integrations/irker.md b/doc/user/project/integrations/irker.md index 22228025969..47017843233 100644 --- a/doc/user/project/integrations/irker.md +++ b/doc/user/project/integrations/irker.md @@ -47,7 +47,7 @@ Irker accepts channel names of the form `chan` and `#chan`, both for the case, `Aorimn` is treated as a nick and no more as a channel name. Irker can also join password-protected channels. Users need to append -`?key=thesecretpassword` to the chan name. When using this feature remember to +`?key=thesecretpassword` to the chan name. When using this feature remember to **not** put the `#` sign in front of the channel name; failing to do so will result on irker joining a channel literally named `#chan?key=password` henceforth leaking the channel key through the `/whois` IRC command (depending on IRC server diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 7cefd55d9aa..acc187d1e6b 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -1364,7 +1364,7 @@ server.start ``` Pick an unused port (e.g. 8000) and start the script: `ruby print_http_body.rb -8000`. Then add your server as a webhook receiver in GitLab as +8000`. Then add your server as a webhook receiver in GitLab as `http://my.host:8000/`. When you press 'Test' in GitLab, you should see something like this in the |