Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-07-06 23:52:00 +0300
committerFelipe Artur <felipefac@gmail.com>2016-07-20 02:57:59 +0300
commit8bd520d70e035cd67d19b7962911ae9c31d1ff3d (patch)
treedd3e8bf4925f36758825879857a54b7d5e94a638 /app/controllers/projects/services_controller.rb
parentb9ed9d658ad447a64d58b2040849a7cc0e698287 (diff)
Allow slack service to send messages on different channels
Diffstat (limited to 'app/controllers/projects/services_controller.rb')
-rw-r--r--app/controllers/projects/services_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 1b91882048e..80553e035f0 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -66,10 +66,15 @@ class Projects::ServicesController < Projects::ApplicationController
end
def service_params
- service_params = params.require(:service).permit(ALLOWED_PARAMS)
+ dynamic_params = []
+ dynamic_params.concat(@service.event_channel_names) if @service.is_a?(SlackService)
+
+ service_params = params.require(:service).permit(ALLOWED_PARAMS + dynamic_params)
+
FILTER_BLANK_PARAMS.each do |param|
service_params.delete(param) if service_params[param].blank?
end
+
service_params
end
end