diff options
| author | Chulki Lee <chulki.lee@gmail.com> | 2015-01-23 16:29:02 -0800 |
|---|---|---|
| committer | Chulki Lee <chulki.lee@gmail.com> | 2015-04-27 21:14:04 +0900 |
| commit | 57c724558db9c17b7d4c27fcbadf93451b801ad7 (patch) | |
| tree | dfa4bccaa4b68bbf590cfd1e4431281a7710037d | |
| parent | bb8c1cadf39415d2f916d135e8bbfdce49842f2f (diff) | |
| download | gitlab-ce-57c724558db9c17b7d4c27fcbadf93451b801ad7.tar.gz | |
Add api version property on hipchat service
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 2080ee9a00f..dc18bbd8d5b 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -1,5 +1,5 @@ class Projects::ServicesController < Projects::ApplicationController - ALLOWED_PARAMS = [:title, :token, :type, :active, :api_key, :subdomain, + ALLOWED_PARAMS = [:title, :token, :type, :active, :api_key, :api_version, :subdomain, :room, :recipients, :project_url, :webhook, :user_key, :device, :priority, :sound, :bamboo_url, :username, :password, :build_key, :server, :teamcity_url, :build_type, diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 2fa5f0ce71c..3a15b2207ea 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -20,7 +20,7 @@ class HipchatService < Service MAX_COMMITS = 3 - prop_accessor :token, :room, :server, :notify, :color + prop_accessor :token, :room, :server, :notify, :color, :api_version validates :token, presence: true, if: :activated? def title @@ -41,6 +41,8 @@ class HipchatService < Service { type: 'text', name: 'room', placeholder: 'Room name or ID' }, { type: 'checkbox', name: 'notify' }, { type: 'select', name: 'color', choices: ['yellow', 'red', 'green', 'purple', 'gray', 'random'] }, + { type: 'text', name: 'api_version', + placeholder: 'Leave blank for default (v2)' }, { type: 'text', name: 'server', placeholder: 'Leave blank for default. https://hipchat.example.com' } ] @@ -60,7 +62,7 @@ class HipchatService < Service private def gate - options = { api_version: 'v2' } + options = { api_version: api_version || 'v2' } options[:server_url] = server unless server.blank? @gate ||= HipChat::Client.new(token, options) end |