summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-03-18 01:29:54 -0400
committerUnknwon <u@gogs.io>2015-03-18 01:29:54 -0400
commit8e815abeb01f7077bb90b0c7d80bd113f2ef7e0c (patch)
tree542d1fcfe2a3f1c30fe88a2c8d6f28b37f9a8900 /cmd
parent466facc0097bf636b6a945a0daebb7c4c5c33c91 (diff)
downloadgitea-8e815abeb01f7077bb90b0c7d80bd113f2ef7e0c.tar.gz
gitea-8e815abeb01f7077bb90b0c7d80bd113f2ef7e0c.zip
#1079: Custom robots.txt should be send with plaintext content-type
Diffstat (limited to 'cmd')
-rw-r--r--cmd/web.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/web.go b/cmd/web.go
index d5e9cd36ab..a06f5b85ed 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -78,7 +78,7 @@ func checkVersion() {
// Check dependency version.
checkers := []VerChecker{
- {"github.com/Unknwon/macaron", macaron.Version, "0.5.1"},
+ {"github.com/Unknwon/macaron", macaron.Version, "0.5.4"},
{"github.com/macaron-contrib/binding", binding.Version, "0.0.6"},
{"github.com/macaron-contrib/cache", cache.Version, "0.0.7"},
{"github.com/macaron-contrib/csrf", csrf.Version, "0.0.3"},
@@ -457,7 +457,7 @@ func runWeb(ctx *cli.Context) {
// robots.txt
m.Get("/robots.txt", func(ctx *middleware.Context) {
if setting.HasRobotsTxt {
- ctx.ServeFile(path.Join(setting.CustomPath, "robots.txt"))
+ ctx.ServeFileContent(path.Join(setting.CustomPath, "robots.txt"))
} else {
ctx.Error(404)
}