summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@me.com>2014-12-29 14:20:22 -0600
committerPatricio Cano <patricio@gitlab.com>2014-12-30 15:59:02 -0500
commite4176236e438fb9140a5a8dcd35be1d0b51a6dfd (patch)
treea8ca397700077cfd8b92a11dc6b5da643b257598
parente6a3b29b7105f7662e6e59ede79462bf12de3ef3 (diff)
downloadgitlab-ce-e4176236e438fb9140a5a8dcd35be1d0b51a6dfd.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