Merge branch 'ee-reduce-service-params-diff-with-ce' into 'master'

Reduce difference with CE in ServiceParams

See merge request gitlab-org/gitlab-ee!8889

app/controllers/concerns/service_params.rb

@@ -2,6 +2,7 @@
 
 module ServiceParams
   extend ActiveSupport::Concern
+
   ALLOWED_PARAMS_CE = [
     :active,
     :add_pusher,

ee/app/controllers/concerns/ee/service_params.rb

@@ -2,6 +2,8 @@
 
 module EE
   module ServiceParams
+    extend ::Gitlab::Utils::Override
+
     ALLOWED_PARAMS_EE = [
       :jenkins_url,
       :multiproject_enabled,
@@ -11,6 +13,7 @@ module EE
       :static_context
     ].freeze
 
+    override :allowed_service_params
     def allowed_service_params
       super + ALLOWED_PARAMS_EE
     end