diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-28 13:57:08 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2018-06-05 16:20:21 +0200 |
| commit | 67fe0a17d87a7a5380b41e04ef23212d5da637ba (patch) | |
| tree | 2be846ca693640f73058ebd0dd1b39b06e3f2666 /app/views/admin/appearances | |
| parent | 40ffa8401b96dda5f67ea699dbcca0ff64263810 (diff) | |
| download | gitlab-ce-67fe0a17d87a7a5380b41e04ef23212d5da637ba.tar.gz | |
call Gitlab::Favicon.status in serializer
this ways we can keep the `lib/gitlab/ci/status/*` classes to return the
bare favicon name as it was before.
also the favicon uploader versions are now have the same names as the
stock favicons (+ `favicon_` prefix), which makes working with the
status names easier.
Diffstat (limited to 'app/views/admin/appearances')
| -rw-r--r-- | app/views/admin/appearances/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml index 8d73bd8fb55..1119c75637c 100644 --- a/app/views/admin/appearances/_form.html.haml +++ b/app/views/admin/appearances/_form.html.haml @@ -62,7 +62,7 @@ = f.label :favicon, 'Favicon', class: 'control-label' .col-sm-10 - if @appearance.favicon? - = image_tag @appearance.favicon.default.url, class: 'appearance-light-logo-preview' + = image_tag @appearance.favicon.favicon_main.url, class: 'appearance-light-logo-preview' - if @appearance.favicon? = f.label :favicon, 'Generated status icons', class: 'control-label' .col-sm-10 |