summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-18 11:31:49 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-18 11:31:49 +0200
commitdf9062d0b50d08a8a484b9780aeb92c53bead530 (patch)
tree13985b14daf1b1614b35aade3f74a0c80f8eb10c /public
parentae4fbae26cefbf10848719ee8c06d418c348420c (diff)
parent38785046f7ec7d834e22add66e4be88f6e985355 (diff)
downloadgitlab-ce-df9062d0b50d08a8a484b9780aeb92c53bead530.tar.gz
Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify
Diffstat (limited to 'public')
-rw-r--r--public/robots.txt3
-rw-r--r--public/uploads/.gitkeep0
2 files changed, 2 insertions, 1 deletions
diff --git a/public/robots.txt b/public/robots.txt
index 528f421083e..4f616c7f4c1 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -38,7 +38,8 @@ Disallow: /*/*/edit
Disallow: /*/*/raw
Disallow: /*/*/blame
Disallow: /*/*/commits/*/*
-Disallow: /*/*/commit
+Disallow: /*/*/commit/*.patch
+Disallow: /*/*/commit/*.diff
Disallow: /*/*/compare
Disallow: /*/*/branches/new
Disallow: /*/*/tags/new
diff --git a/public/uploads/.gitkeep b/public/uploads/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/public/uploads/.gitkeep
+++ /dev/null