diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 06:09:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 06:09:06 +0300 |
commit | 3683fb837cd85942d99f408b22db8c6c7713869f (patch) | |
tree | dd8bbaf3f2d7e58647a479ace47ee26a303d3fdf /app/controllers/concerns/integrations_actions.rb | |
parent | 678e8181aaa08fc1b89e2a2721c842fb46ed730a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns/integrations_actions.rb')
-rw-r--r-- | app/controllers/concerns/integrations_actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/integrations_actions.rb b/app/controllers/concerns/integrations_actions.rb index 39f63bbaaec..8e9b038437d 100644 --- a/app/controllers/concerns/integrations_actions.rb +++ b/app/controllers/concerns/integrations_actions.rb @@ -52,7 +52,7 @@ module IntegrationsActions 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_integration(params[:id]) # rubocop:disable Gitlab/ModuleWithInstanceVariables + @integration = @service ||= find_or_initialize_non_project_specific_integration(params[:id]) # rubocop:disable Gitlab/ModuleWithInstanceVariables end def success_message |