diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-29 13:41:13 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-29 13:41:13 +0200 |
| commit | 93bed4435e9e61570dd27e1660c230c3c323a744 (patch) | |
| tree | 05b8c9871a86dbbe23c5a4a457b49b9177320356 /app/controllers/projects/services_controller.rb | |
| parent | 7c00a841f581dc72a03bf103b8ecf39ce65dc46d (diff) | |
| parent | 776bca07cd4b3996a39035e90232c99599ed2663 (diff) | |
| download | gitlab-ce-93bed4435e9e61570dd27e1660c230c3c323a744.tar.gz | |
Merge pull request #8060 from dblessing/feature/bamboo_service
Add Atlassian Bamboo service
Diffstat (limited to 'app/controllers/projects/services_controller.rb')
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index b50f6286459..a5f30dcfd9d 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -41,7 +41,8 @@ class Projects::ServicesController < Projects::ApplicationController params.require(:service).permit( :title, :token, :type, :active, :api_key, :subdomain, :room, :recipients, :project_url, :webhook, - :user_key, :device, :priority, :sound + :user_key, :device, :priority, :sound, :bamboo_url, :username, :password, + :build_key ) end end |