From 2a402a3e503b3c564b4e9dcbf9d7ede1d2291937 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 18 Jun 2018 11:31:37 +0200
Subject: Redirect favicon.(png|ico) to actual favicon asset or upload

---
 config/routes.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'config/routes.rb')

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
-- 
cgit v1.2.3