summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-01-12 18:48:49 -0800
committerStan Hu <stanhu@gmail.com>2016-01-12 18:48:49 -0800
commitcd243b83fcfb60f69e37ec461bd838f67bbccafc (patch)
tree4050dd8e8ef99f857ae3b950553e47d0b865eb29
parent1813adcdeaef1f27c17dfb98ecf07c57d7687e11 (diff)
parent4819de1e7026849e10a0a05939152dfa01b5ba85 (diff)
downloadgitlab-ce-cd243b83fcfb60f69e37ec461bd838f67bbccafc.tar.gz
Merge pull request #9968 from vimalloc/patch-1
Mention channel/key bug in irkerd docs
-rw-r--r--app/models/project_services/irker_service.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index bd9b580038f..04c714bfaad 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -73,9 +73,10 @@ class IrkerService < Service
'irc[s]://irc.network.net[:port]/#channel. Special cases: if '\
'you want the channel to be a nickname instead, append ",isnick" to ' \
'the channel name; if the channel is protected by a secret password, ' \
- ' append "?key=secretpassword" to the URI. Note that if you specify a ' \
- ' default IRC URI to prepend before each recipient, you can just give ' \
- ' a channel name.' },
+ ' append "?key=secretpassword" to the URI (Note that due to a bug, if you ' \
+ ' want to use a password, you have to omit the "#" on the channel). If you ' \
+ ' specify a default IRC URI to prepend before each recipient, you can just ' \
+ ' give a channel name.' },
{ type: 'checkbox', name: 'colorize_messages' },
]
end