diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /app/helpers/services_helper.rb | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app/helpers/services_helper.rb')
-rw-r--r-- | app/helpers/services_helper.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index f3f4cdc857f..b13cc93436f 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -51,17 +51,13 @@ module ServicesHelper end end - def service_save_button(service) - button_tag(class: 'btn btn-success', type: 'submit', disabled: service.deprecated?, data: { qa_selector: 'save_changes_button' }) do + def service_save_button + button_tag(class: 'btn btn-success', type: 'submit', 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 disable_fields_service?(service) - !current_controller?("admin/services") && service.deprecated? - end - def scoped_integrations_path if @project.present? project_settings_integrations_path(@project) @@ -84,7 +80,7 @@ module ServicesHelper def scoped_edit_integration_path(integration) if @project.present? - edit_project_settings_integration_path(@project, integration) + edit_project_service_path(@project, integration) elsif @group.present? edit_group_settings_integration_path(@group, integration) else @@ -105,7 +101,7 @@ module ServicesHelper extend self end -ServicesHelper.prepend_if_ee('EE::ServicesHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule +ServicesHelper.prepend_if_ee('EE::ServicesHelper') # The methods in `EE::ServicesHelper` should be available as both instance and # class methods. |