Commit 3c725a2a authored by Sean McGivern's avatar Sean McGivern

Merge branch 'dm-favicon-redirect' into 'master'

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

Closes #47840

See merge request gitlab-org/gitlab-ce!19956
parents d222bafe 2a402a3e
......@@ -11,6 +11,12 @@ Rails.application.routes.draw do
post :toggle_award_emoji, on: :member
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 :development
draw :ci
......
......@@ -58,6 +58,7 @@ Currently the following names are reserved as top level groups:
- dashboard
- deploy.html
- explore
- favicon.ico
- favicon.png
- groups
- header_logo_dark.png
......
......@@ -30,6 +30,7 @@ module Gitlab
dashboard
deploy.html
explore
favicon.ico
favicon.png
files
groups
......
public/favicon.png

1.57 KB

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