From 71d5a090df0649b1782f25319063c831efda332a Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 23 Feb 2020 15:34:53 +0100 Subject: [PATCH] Prevent Firefox from using apple-touch-icon (#10402) * Prevent Firefox from using apple-touch-icon The opaque background does not work well in Firefox which uses the icon as a "rich icon". Prevent this by not specifying it in HTML. Real Apple devices will still request the icon on the static path. Fixes: https://github.com/go-gitea/gitea/issues/10394 Also adjust gitignore so app.ini.sample becomes searchable and fixed a variable name in app.ini.sample. * fix gitignore --- .gitignore | 5 ++++- custom/conf/app.ini.sample | 2 +- routers/routes/routes.go | 4 ++++ templates/base/head.tmpl | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 29850ea74..f588c8152 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,10 @@ coverage.all /bin /dist -/custom +/custom/* +!/custom/conf +/custom/conf/* +!/custom/conf/app.ini.sample /data /indexers /log diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index cf9eda05d..328d78e2c 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -217,7 +217,7 @@ FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd PROTOCOL = http DOMAIN = localhost ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/ -; when STATIC_URL_PREFIX is empty it will follow APP_URL +; when STATIC_URL_PREFIX is empty it will follow ROOT_URL STATIC_URL_PREFIX = ; The address to listen on. Either a IPv4/IPv6 address or the path to a unix socket. HTTP_ADDR = 0.0.0.0 diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 679152c0e..525115fb9 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -1002,6 +1002,10 @@ func RegisterRoutes(m *macaron.Macaron) { } }) + m.Get("/apple-touch-icon.png", func(ctx *context.Context) { + ctx.Redirect(path.Join(setting.StaticURLPrefix, "img/apple-touch-icon.png"), 301) + }) + // Progressive Web App m.Get("/manifest.json", templates.JSONRenderer(), func(ctx *context.Context) { ctx.HTML(200, "pwa/manifest_json") diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index f1558f948..9985b7cb5 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -96,7 +96,6 @@ }; -