diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-28 11:32:37 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-28 11:32:37 +0300 |
| commit | f0227d761fa24b7f0fdf0b5fecd6d52a6d991714 (patch) | |
| tree | bb5d7e83823195212db5151824fd33ea1ab9cc77 /app/controllers | |
| parent | 2940de43a5aba532e67022e03eb6d5772625c248 (diff) | |
| parent | f93616d62b7ea174da2e0c86ae1325a805ddccef (diff) | |
| download | gitlab-ce-f0227d761fa24b7f0fdf0b5fecd6d52a6d991714.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 2 |
1 files changed, 1 insertions, 1 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, |