Merge branch '235969-fix-docker-icon-in-the-file-icons-svg-map' into 'master'

Resolve "Fix docker icon in the file icons svg map" Closes #235969 See merge request gitlab-org/gitlab!40785

Merge branch '235969-fix-docker-icon-in-the-file-icons-svg-map' into 'master'
Resolve "Fix docker icon in the file icons svg map" Closes #235969 See merge request gitlab-org/gitlab!40785
b9481f65 · Phil Hughes · f9b79883 · bd75dd01 · b9481f65 · b9481f65
Commit b9481f65 authored Sep 15, 2020 by Phil Hughes
Showing with 6 additions and 1 deletion

app/assets/images/file_icons.svg app/assets/images/file_icons.svg +1 -1

changelogs/unreleased/235969-fix-docker-icon-in-the-file-icons-svg-map.yml ...ased/235969-fix-docker-icon-in-the-file-icons-svg-map.yml +5 -0

No files found.
--- a/app/assets/images/file_icons.svg
+++ b/app/assets/images/file_icons.svg
--- a/changelogs/unreleased/235969-fix-docker-icon-in-the-file-icons-svg-map.yml
+++ b/changelogs/unreleased/235969-fix-docker-icon-in-the-file-icons-svg-map.yml
+---
+title: Fix docker file icon
+merge_request: 40785
+author:
+type: fixed