From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Nov 2020 08:27:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- app/helpers/services_helper.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'app/helpers/services_helper.rb') diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 114bbf59ae1..96eb14be4b4 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -35,13 +35,6 @@ module ServicesHelper "#{event}_events" end - def service_save_button(disabled: false) - button_tag(class: 'btn btn-success', type: 'submit', disabled: disabled, data: { qa_selector: 'save_changes_button' }) do - icon('spinner spin', class: 'hidden js-btn-spinner') + - content_tag(:span, 'Save changes', class: 'js-btn-label') - end - end - def scoped_integrations_path if @project.present? project_settings_integrations_path(@project) @@ -100,7 +93,8 @@ module ServicesHelper editable: integration.editable?.to_s, cancel_path: scoped_integrations_path, can_test: integration.can_test?.to_s, - test_path: scoped_test_integration_path(integration) + test_path: scoped_test_integration_path(integration), + reset_path: '' } end @@ -121,7 +115,7 @@ module ServicesHelper end def group_level_integrations? - @group.present? && Feature.enabled?(:group_level_integrations, @group) + @group.present? && Feature.enabled?(:group_level_integrations, @group, default_enabled: true) end def instance_level_integrations? -- cgit v1.2.1