diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
commit | 0452e0a57e24fdd65f559cc1a8629892714adc7a (patch) | |
tree | bf33ca472a3d434770783d80b5d10211383e706c /app/models/project_services/irker_service.rb | |
parent | 7690513495d02d14af8a1a0cb3bf00f243ec0419 (diff) | |
parent | f76596380fb545c54b14c6bfc339a68a1dc162d3 (diff) | |
download | gitlab-ce-0452e0a57e24fdd65f559cc1a8629892714adc7a.tar.gz |
Merge branch 'master' into faster-diffsfaster-diffs
Diffstat (limited to 'app/models/project_services/irker_service.rb')
-rw-r--r-- | app/models/project_services/irker_service.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb index 58cb720c3c1..ce7d1c5d5b1 100644 --- a/app/models/project_services/irker_service.rb +++ b/app/models/project_services/irker_service.rb @@ -112,15 +112,7 @@ class IrkerService < Service # Authorize both irc://domain.com/#chan and irc://domain.com/chan if uri.is_a?(URI) && uri.scheme[/^ircs?\z/] && !uri.path.nil? - # Do not authorize irc://domain.com/ - if uri.fragment.nil? && uri.path.length > 1 - uri.to_s - else - # Authorize irc://domain.com/smthg#chan - # The irker daemon will deal with it by concatenating smthg and - # chan, thus sending messages on #smthgchan - uri.to_s - end + uri.to_s end end end |