diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /app/helpers/user_callouts_helper.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/helpers/user_callouts_helper.rb')
| -rw-r--r-- | app/helpers/user_callouts_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb index 7a90984cd77..23db3be631c 100644 --- a/app/helpers/user_callouts_helper.rb +++ b/app/helpers/user_callouts_helper.rb @@ -44,7 +44,7 @@ module UserCalloutsHelper def show_service_templates_deprecated_callout? !Gitlab.com? && current_user&.admin? && - Service.for_template.active.exists? && + Integration.for_template.active.exists? && !user_dismissed?(SERVICE_TEMPLATES_DEPRECATED_CALLOUT) end @@ -80,4 +80,4 @@ module UserCalloutsHelper end end -UserCalloutsHelper.prepend_if_ee('EE::UserCalloutsHelper') +UserCalloutsHelper.prepend_mod_with('UserCalloutsHelper') |