Commit 2a402a3e authored by Douwe Maan's avatar Douwe Maan

Redirect favicon.(png|ico) to actual favicon asset or upload

parent 99fdbe4c
...@@ -11,6 +11,12 @@ Rails.application.routes.draw do ...@@ -11,6 +11,12 @@ Rails.application.routes.draw do
post :toggle_award_emoji, on: :member post :toggle_award_emoji, on: :member
end end
favicon_redirect = redirect do |_params, _request|
ActionController::Base.helpers.asset_url(Gitlab::Favicon.main)
end
get 'favicon.png', to: favicon_redirect
get 'favicon.ico', to: favicon_redirect
draw :sherlock draw :sherlock
draw :development draw :development
draw :ci draw :ci
......
...@@ -58,6 +58,7 @@ Currently the following names are reserved as top level groups: ...@@ -58,6 +58,7 @@ Currently the following names are reserved as top level groups:
- dashboard - dashboard
- deploy.html - deploy.html
- explore - explore
- favicon.ico
- favicon.png - favicon.png
- groups - groups
- header_logo_dark.png - header_logo_dark.png
......
...@@ -30,6 +30,7 @@ module Gitlab ...@@ -30,6 +30,7 @@ module Gitlab
dashboard dashboard
deploy.html deploy.html
explore explore
favicon.ico
favicon.png favicon.png
files files
groups groups
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment