summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-10-11 09:12:15 +0000
committerRobert Speicher <robert@gitlab.com>2016-10-11 09:12:15 +0000
commit0d6bcc5b4bbbfe4144bb71e89e06d16d20ef497d (patch)
tree5629bb4bad1ad492695ca8f37d017fe5cb1c6d6c
parent9616f9b441ee5422517798a02bcd93c210b596ec (diff)
parentef696f592fd1eed038c789379837554237ff5974 (diff)
downloadgitlab-ce-0d6bcc5b4bbbfe4144bb71e89e06d16d20ef497d.tar.gz
Merge branch 'reserve-robots-txt-namespace' into 'master'
Add `robots.txt` to the list of reserved namespaces See #22759 See merge request !6789
-rw-r--r--app/validators/namespace_validator.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/validators/namespace_validator.rb b/app/validators/namespace_validator.rb
index 4dc3b2ab9a0..2821ecf0a88 100644
--- a/app/validators/namespace_validator.rb
+++ b/app/validators/namespace_validator.rb
@@ -24,6 +24,7 @@ class NamespaceValidator < ActiveModel::EachValidator
projects
public
repository
+ robots.txt
s
search
services