summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-21 16:43:27 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-21 16:50:38 +0200
commite1bf40e293409d974a8013685ec544c0f633ef16 (patch)
tree018dcddbdbc7e5e11e48d852e199bb0f021e1077
parent7e88b242ce194958c6a59755eb434c17625c4395 (diff)
downloadgitlab-ce-dz-whitelist-more-project-names.tar.gz
Whitelist next project names: help, ci, admin, searchdz-whitelist-more-project-names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/validators/project_path_validator.rb2
-rw-r--r--changelogs/unreleased/dz-whitelist-more-project-names.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/validators/project_path_validator.rb b/app/validators/project_path_validator.rb
index d9ab8f167d8..79b2c99fd70 100644
--- a/app/validators/project_path_validator.rb
+++ b/app/validators/project_path_validator.rb
@@ -15,7 +15,7 @@ class ProjectPathValidator < ActiveModel::EachValidator
# 'tree' as project name and 'deploy_keys' as route.
#
RESERVED = (NamespaceValidator::RESERVED -
- %w[dashboard] +
+ %w[dashboard help ci admin search] +
%w[tree commits wikis new edit create update logs_tree
preview blob blame raw files create_dir find_file]).freeze
diff --git a/changelogs/unreleased/dz-whitelist-more-project-names.yml b/changelogs/unreleased/dz-whitelist-more-project-names.yml
new file mode 100644
index 00000000000..4a3f1511a0b
--- /dev/null
+++ b/changelogs/unreleased/dz-whitelist-more-project-names.yml
@@ -0,0 +1,4 @@
+---
+title: 'Whitelist next project names: help, ci, admin, search'
+merge_request: 8227
+author: