diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-20 08:45:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-20 08:45:08 +0000 |
| commit | 439c63365f196badda401be0f8517ec9a561b99a (patch) | |
| tree | 078cb92cce28fc91fceec63c9d79e1ce52b0ab67 /app/views/shared/_service_settings.html.haml | |
| parent | bce962a87c9aa76b63f96b1c7ce302ba233ea68e (diff) | |
| parent | 2ee197086a87d22c9203c9a3642f9db6d40f54c4 (diff) | |
| download | gitlab-ce-439c63365f196badda401be0f8517ec9a561b99a.tar.gz | |
Merge branch 'issue_25542' into 'master'
Improve JIRA event descriptions
Closes #25542
See merge request gitlab-org/gitlab-ce!17811
Diffstat (limited to 'app/views/shared/_service_settings.html.haml')
| -rw-r--r-- | app/views/shared/_service_settings.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 355b3ac75ae..a41aaed66a3 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -33,7 +33,7 @@ = form.text_field field[:name], class: "form-control", placeholder: field[:placeholder] %p.light - = service_event_description(event) + = @service.class.event_description(event) - @service.global_fields.each do |field| - type = field[:type] |