summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@me.com>2014-12-29 14:20:22 -0600
committerDrew Blessing <drew.blessing@me.com>2014-12-29 18:51:39 -0600
commit9f9f1b3b87431221e15b52c6385afbfa6fdb0723 (patch)
treeac6d2a7411f75776718ecfbce433084c10f8e31a
parenta9cf84e5acf1385391279eaa49e9b0d34c3050b9 (diff)
downloadgitlab-ce-9f9f1b3b87431221e15b52c6385afbfa6fdb0723.tar.gz
Fix HipChat Server
-rw-r--r--app/models/project_services/hipchat_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index a848d74044c..6ef4b210c56 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -35,7 +35,7 @@ class HipchatService < Service
{ type: 'text', name: 'token', placeholder: '' },
{ type: 'text', name: 'room', placeholder: '' },
{ type: 'text', name: 'server',
- placeholder: 'Leave blank for default. https://chat.hipchat.com' }
+ placeholder: 'Leave blank for default. https://hipchat.example.com' }
]
end
@@ -47,7 +47,7 @@ class HipchatService < Service
def gate
options = { api_version: 'v2' }
- options[:server_url] = server unless server.nil?
+ options[:server_url] = server unless server.blank?
@gate ||= HipChat::Client.new(token, options)
end