Commit 09ca102f authored by Tom Quirk's avatar Tom Quirk

Make Service template table a gitlab-ui table

Also, fix a service template related spec.
parent e86cde7d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%h3.page-title %h3.page-title
= @service.title = @service.title
%p #{@service.description} template. %p= @service.description
= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form js-integration-settings-form' } do |form| = form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form js-integration-settings-form' } do |form|
= render 'shared/service_settings', form: form, integration: @service = render 'shared/service_settings', form: form, integration: @service
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
= sprite_icon('error', css_class: 'gl-alert-icon gl-alert-icon-no-title') = sprite_icon('error', css_class: 'gl-alert-icon gl-alert-icon-no-title')
%h4.gl-alert-title= _('Service templates are deprecated and will be removed in GitLab 14.0.') %h4.gl-alert-title= _('Service templates are deprecated and will be removed in GitLab 14.0.')
.gl-alert-body .gl-alert-body
= html_escape(s_("AdminSettings|You can't add new templates. To migrate or remove a Service template, create a new integration at %{settings_link_start}Settings &gt; Integrations%{link_end}. Learn more about %{doc_link_start}Project integration management%{link_end}.")) % { settings_link_start: settings_link_start, doc_link_start: doc_link_start, link_end: '</a>'.html_safe } = html_escape_once(s_("AdminSettings|You can't add new templates. To migrate or remove a Service template, create a new integration at %{settings_link_start}Settings &gt; Integrations%{link_end}. Learn more about %{doc_link_start}Project integration management%{link_end}.")).html_safe % { settings_link_start: settings_link_start, doc_link_start: doc_link_start, link_end: '</a>'.html_safe }
...@@ -5,10 +5,9 @@ ...@@ -5,10 +5,9 @@
- if @activated_services.any? - if @activated_services.any?
%h3.page-title Service templates %h3.page-title Service templates
%p.light= s_('AdminSettings|Service template allows you to set default values for integrations') %p= s_('AdminSettings|Service template allows you to set default values for integrations')
.table-holder %table.table.b-table.gl-table
%table.table
%colgroup %colgroup
%col %col
%col %col
......
...@@ -288,8 +288,6 @@ RSpec.describe 'Admin updates settings' do ...@@ -288,8 +288,6 @@ RSpec.describe 'Admin updates settings' do
end end
end end
context 'Integration page', :js do context 'Integration page', :js do
before do before do
visit integrations_admin_application_settings_path visit integrations_admin_application_settings_path
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment