diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-02 10:10:51 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-02 10:10:51 +0000 |
| commit | c2118657dbe7728a751f29767cc89b4a80f39b92 (patch) | |
| tree | dd43c039b0e9d1ac60f7419743575879262c7a13 | |
| parent | 769a9c300a7473dad9c68e8c0448013f803b496a (diff) | |
| parent | d9c5b72896c006573f5435157e993705695ffe0c (diff) | |
| download | gitlab-ce-c2118657dbe7728a751f29767cc89b4a80f39b92.tar.gz | |
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
| -rw-r--r-- | app/views/admin/services/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml index 97373a3c350..ab08d5c4906 100644 --- a/app/views/admin/services/_form.html.haml +++ b/app/views/admin/services/_form.html.haml @@ -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 |