summaryrefslogtreecommitdiff
path: root/app/controllers/admin/services_controller.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-07-12 17:00:49 -0300
committerFelipe Artur <felipefac@gmail.com>2016-07-19 20:59:00 -0300
commitede048b930b2ceb89013793d878524eb20248d1f (patch)
tree4650debc2eaefa36fef4636efc60cdb60ae47fa5 /app/controllers/admin/services_controller.rb
parent8bd520d70e035cd67d19b7962911ae9c31d1ff3d (diff)
downloadgitlab-ce-ede048b930b2ceb89013793d878524eb20248d1f.tar.gz
Add project service documentation and update integration documentation
Diffstat (limited to 'app/controllers/admin/services_controller.rb')
-rw-r--r--app/controllers/admin/services_controller.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 40938986a92..9d6287f3b61 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -1,4 +1,6 @@
class Admin::ServicesController < Admin::ApplicationController
+ include ServiceParams
+
before_action :service, only: [:edit, :update]
def index
@@ -37,18 +39,4 @@ class Admin::ServicesController < Admin::ApplicationController
def service
@service ||= Service.where(id: params[:id], template: true).first
end
-
- def application_services_params
- dynamic_params = []
- dynamic_params.concat(@service.event_channel_names) if @service.is_a?(SlackService)
-
- application_services_params = params.permit(:id,
- service: Projects::ServicesController::ALLOWED_PARAMS + dynamic_params)
- if application_services_params[:service].is_a?(Hash)
- Projects::ServicesController::FILTER_BLANK_PARAMS.each do |param|
- application_services_params[:service].delete(param) if application_services_params[:service][param].blank?
- end
- end
- application_services_params
- end
end