diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 23:30:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 23:30:46 +0300 |
| commit | 1d287b31040662f1cc53a61b866ea97931a6b850 (patch) | |
| tree | 64c1ff71f40695c1d516a7b24cabf06c408685f1 /app/controllers | |
| parent | fdcb3d47df0526a9dc437c847683df8aae1e5d58 (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/integrations_actions.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/integrations_actions.rb b/app/controllers/concerns/integrations_actions.rb index f5a3ec913c2..09087257888 100644 --- a/app/controllers/concerns/integrations_actions.rb +++ b/app/controllers/concerns/integrations_actions.rb @@ -48,9 +48,12 @@ module IntegrationsActions private + # rubocop: disable Gitlab/ModuleWithInstanceVariables def integration @integration ||= find_or_initialize_non_project_specific_integration(params[:id]) + @service ||= @integration # TODO: remove references to @service https://gitlab.com/gitlab-org/gitlab/-/issues/329759 end + # rubocop: enable Gitlab/ModuleWithInstanceVariables def success_message if integration.active? |