diff --git a/.gitignore b/.gitignore
index 29850ea748f..f588c8152b1 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 cf9eda05d42..328d78e2ca9 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 679152c0ed8..525115fb950 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 f1558f94843..9985b7cb59e 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -96,7 +96,6 @@
};
-