diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-06-15 12:28:23 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-06-15 12:28:23 +0200 |
| commit | 5fc3b8a08d9264eedbf886c45b4ef7b418df380d (patch) | |
| tree | 43a12031b52f267237f2539b42815c33061f82ea /app/views | |
| parent | a8445cc29d81f8d8169e93cd4ef6692aa0fef1fb (diff) | |
| download | gitlab-ce-5fc3b8a08d9264eedbf886c45b4ef7b418df380d.tar.gz | |
Remove FaviconUploader favicon_main versiondm-remove-favicon-main-version
See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/appearances/_form.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml index 94db374040c..a0861870ba4 100644 --- a/app/views/admin/appearances/_form.html.haml +++ b/app/views/admin/appearances/_form.html.haml @@ -25,7 +25,7 @@ = f.label :favicon, 'Favicon', class: 'col-sm-2 col-form-label' .col-sm-10 - if @appearance.favicon? - = image_tag @appearance.favicon.favicon_main.url, class: 'appearance-light-logo-preview' + = image_tag @appearance.favicon_url, class: 'appearance-light-logo-preview' - if @appearance.persisted? %br = link_to 'Remove favicon', favicon_admin_appearances_path, data: { confirm: "Favicon will be removed. Are you sure?"}, method: :delete, class: "btn btn-inverted btn-remove btn-sm remove-logo" @@ -33,9 +33,9 @@ = f.hidden_field :favicon_cache = f.file_field :favicon, class: '' .hint - Maximum file size is 1MB. Allowed image formats are #{favicon_extension_whitelist}. + Maximum file size is 1MB. Image size must be 32x32px. Allowed image formats are #{favicon_extension_whitelist}. %br - The resulting favicons will be cropped to be square and scaled down to a size of 32x32 px. + Images with incorrect dimensions are not resized automatically, and may result in unexpected behavior. %fieldset.sign-in %legend |