Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 3 deletions

diff --git a/app/controllers/concerns/integrations_actions.rb b/app/controllers/concerns/integrations_actions.rb
index 3c1036bbd34..cf3c765a0ec 100644
--- a/app/controllers/concerns/integrations_actions.rb
+++ b/app/controllers/concerns/integrations_actions.rb
@@ -54,9 +54,8 @@ module IntegrationsActions
   end
 
   def integration
-    # Using instance variable `@service` still required as it's used in ServiceParams
-    # and app/views/shared/_service_settings.html.haml. Should be removed once
-    # those 2 are refactored to use `@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_integration(params[:id]) # rubocop:disable Gitlab/ModuleWithInstanceVariables
   end