summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-26 21:51:31 -0700
committerStan Hu <stanhu@gmail.com>2015-05-26 21:57:24 -0700
commit0c9463174ba5b73156ed786648fb782fe79947e9 (patch)
tree6f24948ead8d22eb48812b2070cd5f9c3f041073 /app/models
parentdfa1d96a1fa372b292c83424f62ae10d2c053fbd (diff)
downloadgitlab-ce-0c9463174ba5b73156ed786648fb782fe79947e9.tar.gz
Allow HipChat API version to be blank and default to v2
Closes #772
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project_services/hipchat_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 38cb64f8c48..6761f00183e 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -63,7 +63,7 @@ class HipchatService < Service
private
def gate
- options = { api_version: api_version || 'v2' }
+ options = { api_version: api_version.present? ? api_version : 'v2' }
options[:server_url] = server unless server.blank?
@gate ||= HipChat::Client.new(token, options)
end