summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-08 18:27:22 +0000
committerRobert Speicher <robert@gitlab.com>2016-01-08 18:27:22 +0000
commit6467448a1aaaa216560d35f2bd0ac4f8932f77ec (patch)
treee1544862169331aebd697c5ba449bd9d051ed979
parent7403df6ca7bd31cd002d6fcf3bf4aa02dd4478eb (diff)
parentc3c0dda3f585f6f6064491a8838725df3c6c88c6 (diff)
downloadgitlab-ce-6467448a1aaaa216560d35f2bd0ac4f8932f77ec.tar.gz
Merge branch 'blacklist-new' into 'master'
Add 'new' as a reserved namespace name Closes #5930 See merge request !2344
-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 10e35ce665a..7a35958cc5f 100644
--- a/app/validators/namespace_validator.rb
+++ b/app/validators/namespace_validator.rb
@@ -17,6 +17,7 @@ class NamespaceValidator < ActiveModel::EachValidator
hooks
issues
merge_requests
+ new
notes
profile
projects