summaryrefslogtreecommitdiff
path: root/app/helpers/services_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/services_helper.rb')
-rw-r--r--app/helpers/services_helper.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index 3516000e296..5f361e6653d 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -76,6 +76,8 @@ module ServicesHelper
end
def scoped_reset_integration_path(integration, group: nil)
+ return '' unless integration.persisted?
+
if group.present?
reset_group_settings_integration_path(group, integration)
else
@@ -102,7 +104,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_integration?(integration, group: group) ? scoped_reset_integration_path(integration, group: group) : ''
+ reset_path: scoped_reset_integration_path(integration, group: group)
}
end
@@ -126,10 +128,6 @@ module ServicesHelper
!Gitlab.com?
end
- def reset_integration?(integration, group: nil)
- integration.persisted? && Feature.enabled?(:reset_integrations, group, type: :development)
- end
-
extend self
private