diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-12 00:10:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-12 00:10:13 +0300 |
| commit | 87911fabb2cfd90c22d160d4d2cee7d2bf47dedd (patch) | |
| tree | 18dcf5db116e6ba1f93179f65c10e7c8d848cb78 /app/helpers/services_helper.rb | |
| parent | 3172281335efddd1078fa6c601f3ba8782f73192 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/services_helper.rb')
| -rw-r--r-- | app/helpers/services_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 43bc535d1b0..3516000e296 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -102,7 +102,7 @@ module ServicesHelper cancel_path: scoped_integrations_path, can_test: integration.can_test?.to_s, test_path: scoped_test_integration_path(integration), - reset_path: reset_integrations?(group: group) ? scoped_reset_integration_path(integration, group: group) : '' + reset_path: reset_integration?(integration, group: group) ? scoped_reset_integration_path(integration, group: group) : '' } end @@ -126,8 +126,8 @@ module ServicesHelper !Gitlab.com? end - def reset_integrations?(group: nil) - Feature.enabled?(:reset_integrations, group, type: :development) + def reset_integration?(integration, group: nil) + integration.persisted? && Feature.enabled?(:reset_integrations, group, type: :development) end extend self |