summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-23 14:31:02 +0000
committerPhil Hughes <me@iamphill.com>2019-05-23 14:31:02 +0000
commit9d655625dd7180f704cae2330ebd02abb0f7f15e (patch)
tree9fdd280bcd0d196fab6cf5d30a808d2ba4b76970
parent2cde6864d1c94e1000853d52170380114775165f (diff)
parent3b957bd5080a94110c1e438171844973b99c6da6 (diff)
downloadgitlab-ce-9d655625dd7180f704cae2330ebd02abb0f7f15e.tar.gz
Merge branch '59026-replace-favicon' into 'master'
Add new favicon for canary from next.gitlab.com Closes #59026 See merge request gitlab-org/gitlab-ce!28601
-rw-r--r--app/assets/images/favicon-yellow.pngbin1667 -> 1481 bytes
-rw-r--r--changelogs/unreleased/59026-replace-favicon.yml5
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/images/favicon-yellow.png b/app/assets/images/favicon-yellow.png
index 2d5289818b4..a80827808fc 100644
--- a/app/assets/images/favicon-yellow.png
+++ b/app/assets/images/favicon-yellow.png
Binary files differ
diff --git a/changelogs/unreleased/59026-replace-favicon.yml b/changelogs/unreleased/59026-replace-favicon.yml
new file mode 100644
index 00000000000..34228bb8438
--- /dev/null
+++ b/changelogs/unreleased/59026-replace-favicon.yml
@@ -0,0 +1,5 @@
+---
+title: Update favicon from next
+merge_request: 28601
+author: Jarek Ostrowski @jareko
+type: fixed