summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-01-09 12:17:40 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-01-09 12:17:40 +0000
commit6d0b5f9bfbdd618920ab011a01c7c411815e45e3 (patch)
tree9a8255dd346ab187885a8283dc2fa38bf0acfe7f
parent088de97c3d86d9cf615538836527d23dbccd9712 (diff)
parentbe8b9021f2578ced36295557a4476119270463fc (diff)
downloadgitlab-ce-6d0b5f9bfbdd618920ab011a01c7c411815e45e3.tar.gz
Merge branch 'patch-24' into 'master'
Update irker documentation to mention an irker bug with key-protected channels. See merge request gitlab-org/gitlab-ce!16274
-rw-r--r--doc/user/project/integrations/irker.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/project/integrations/irker.md b/doc/user/project/integrations/irker.md
index c63ea1316fe..ecdd83ce8f0 100644
--- a/doc/user/project/integrations/irker.md
+++ b/doc/user/project/integrations/irker.md
@@ -47,4 +47,8 @@ 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.
+`?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
+configuration). This is due to a long standing irker bug.