Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 3 insertions, 5 deletions

diff --git a/app/controllers/concerns/integrations_actions.rb b/app/controllers/concerns/integrations_actions.rb
index a3ea39d9c3d..f5a3ec913c2 100644
--- a/app/controllers/concerns/integrations_actions.rb
+++ b/app/controllers/concerns/integrations_actions.rb
@@ -4,7 +4,7 @@ module IntegrationsActions
   extend ActiveSupport::Concern
 
   included do
-    include ServiceParams
+    include Integrations::Params
 
     before_action :integration, only: [:edit, :update, :test]
   end
@@ -14,7 +14,7 @@ module IntegrationsActions
   end
 
   def update
-    saved = integration.update(service_params[:service])
+    saved = integration.update(integration_params[:integration])
 
     respond_to do |format|
       format.html do
@@ -49,9 +49,7 @@ module IntegrationsActions
   private
 
   def integration
-    # Using instance variable `@service` still required as it's used in ServiceParams.
-    # Should be removed once that is refactored to use `@integration`.
-    @integration = @service ||= find_or_initialize_non_project_specific_integration(params[:id]) # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    @integration ||= find_or_initialize_non_project_specific_integration(params[:id])
   end
 
   def success_message