Merge branch '12532-services-form' into 'master'

Removes EE differences for app/views/admin/services/_form.html.haml

Closes gitlab-ee#12532

See merge request gitlab-org/gitlab-ce!30231
This commit is contained in:
Phil Hughes 2019-07-02 10:10:51 +00:00
commit c2118657db

View file

@ -1,7 +1,7 @@
%h3.page-title
= @service.title
%p #{@service.description} template
%p #{@service.description} template.
= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form' } do |form|
= render 'shared/service_settings', form: form, subject: @service