diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-20 00:08:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-20 00:08:32 +0300 |
commit | 60082b335c09b27ebee3452a36cc62eb76df3480 (patch) | |
tree | 8a34e789590856679bca7955cda7fda06e257590 /app/controllers | |
parent | ce493944f48fb2ad08a5381a7ed1f37ced637bd1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/integrations_actions.rb | 5 |
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 |