summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-06-18 11:31:37 +0200
committerDouwe Maan <douwe@selenight.nl>2018-06-18 12:27:00 +0200
commit2a402a3e503b3c564b4e9dcbf9d7ede1d2291937 (patch)
tree90d763eff4ab2f4cb05255d043e38fc7c96c2a1b /config
parent99fdbe4c230205510e1d7061e68bb1a003913d4b (diff)
downloadgitlab-ce-2a402a3e503b3c564b4e9dcbf9d7ede1d2291937.tar.gz
Redirect favicon.(png|ico) to actual favicon asset or uploaddm-favicon-redirect
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 52726f94753..e0a9139b1b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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