diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-27 07:27:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-27 07:27:03 +0000 |
| commit | 62d0ce19ed8554a5de4fae3847df6150bb09f23b (patch) | |
| tree | dcd5c8c30ab135acae4292fc3eac0e61ef4cbdce /app | |
| parent | 8044b4d2785fb57e1b19e078aeed862ff65fbbfe (diff) | |
| parent | 0c9463174ba5b73156ed786648fb782fe79947e9 (diff) | |
| download | gitlab-ce-62d0ce19ed8554a5de4fae3847df6150bb09f23b.tar.gz | |
Merge branch 'fix-hipchat-default-api-version' into 'master'
Allow HipChat API version to be blank and default to v2
### What does this MR do?
This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional.
### Why was this MR needed?
The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error.
### What are the relevant issue numbers?
Closes #772
See merge request !718
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 2 |
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 |