Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
c957285727
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue