diff options
Diffstat (limited to 'app/views/admin/services')
-rw-r--r-- | app/views/admin/services/_form.html.haml | 9 | ||||
-rw-r--r-- | app/views/admin/services/_service_templates_deprecated_alert.html.haml | 10 | ||||
-rw-r--r-- | app/views/admin/services/edit.html.haml | 6 | ||||
-rw-r--r-- | app/views/admin/services/index.html.haml | 43 |
4 files changed, 0 insertions, 68 deletions
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml deleted file mode 100644 index 4d9fa6d3d57..00000000000 --- a/app/views/admin/services/_form.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -= render "service_templates_deprecated_alert" - -%h3.page-title - = @service.title - -%p= @service.description - -= 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 diff --git a/app/views/admin/services/_service_templates_deprecated_alert.html.haml b/app/views/admin/services/_service_templates_deprecated_alert.html.haml deleted file mode 100644 index eac2f9c7f4e..00000000000 --- a/app/views/admin/services/_service_templates_deprecated_alert.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- doc_link_start = "<a href=\"#{integrations_help_page_path}\" target='_blank' rel='noopener noreferrer'>".html_safe -- settings_link_start = "<a href=\"#{integrations_admin_application_settings_path}\">".html_safe - -.gl-alert.gl-alert-danger.gl-mt-5{ role: 'alert' } - .gl-alert-container - = sprite_icon('error', css_class: 'gl-alert-icon gl-alert-icon-no-title') - .gl-alert-content - %h4.gl-alert-title= s_('AdminSettings|Service templates are deprecated and will be removed in GitLab 14.0.') - .gl-alert-body - = 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 > 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 } diff --git a/app/views/admin/services/edit.html.haml b/app/views/admin/services/edit.html.haml deleted file mode 100644 index d13b5a34dac..00000000000 --- a/app/views/admin/services/edit.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -- add_to_breadcrumbs _("Service Templates"), admin_application_settings_services_path -- page_title @service.title, _("Service Templates") -- breadcrumb_title @service.title -- @content_class = 'limit-container-width' unless fluid_layout - -= render 'form' diff --git a/app/views/admin/services/index.html.haml b/app/views/admin/services/index.html.haml deleted file mode 100644 index 91706452402..00000000000 --- a/app/views/admin/services/index.html.haml +++ /dev/null @@ -1,43 +0,0 @@ -- page_title _("Service Templates") -- @content_class = 'limit-container-width' unless fluid_layout - -= render "service_templates_deprecated_alert" - -- if @activated_services.any? - %h3.page-title Service templates - %p= s_('AdminSettings|Service template allows you to set default values for integrations') - - %table.table.b-table.gl-table - %colgroup - %col - %col - %col - %col{ width: 135 } - %thead - %tr - %th - %th= _('Service') - %th= _('Description') - %th= _('Last edit') - - @activated_services.each do |service| - - if service.type.in?(@existing_instance_types) - %tr - %td - %td - = link_to edit_admin_application_settings_integration_path(service.to_param), class: 'gl-text-blue-300!' do - %strong.has-tooltip{ title: s_('AdminSettings|Moved to integrations'), data: { container: 'body' } } - = service.title - %td.gl-cursor-default.gl-text-gray-400 - = service.description - %td - - else - %tr - %td - = boolean_to_icon service.activated? - %td - = link_to edit_admin_application_settings_service_path(service.id) do - %strong= service.title - %td - = service.description - %td.light - = time_ago_with_tooltip service.updated_at |