diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-06 16:14:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-06 16:14:48 +0000 |
| commit | 70004f4ef6160e788e6a600b9da06608c8559aa2 (patch) | |
| tree | 7ee7c7990126555f6edd0ba95bb8b5bf1927d029 /app/controllers | |
| parent | 0fed1b587630ff98808c61881511ee7c077c3db6 (diff) | |
| parent | eceef546d19c16d16772868a05e6769907442f83 (diff) | |
| download | gitlab-ce-70004f4ef6160e788e6a600b9da06608c8559aa2.tar.gz | |
Merge branch 'slack_integration' into 'master'
Slack integration
See merge request !1151
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 4c558e137ea..b50f6286459 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -40,7 +40,7 @@ class Projects::ServicesController < Projects::ApplicationController def service_params params.require(:service).permit( :title, :token, :type, :active, :api_key, :subdomain, - :room, :recipients, :project_url, + :room, :recipients, :project_url, :webhook, :user_key, :device, :priority, :sound ) end |