Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-12-21 19:45:47 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-22 00:26:43 +0300
commit78fbee78dc527769046f88cb9d592a24690d6f4c (patch)
treed42317325540d1586b79fbe3bb958d35c4703b67
parente25b31ac81eb9cbd4e6eefb24a1f83e735bd628d (diff)
Merge branch 'dz-whitelist-more-project-names' into 'master'
Whitelist more project names See merge request !8227
-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: