summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-21 21:08:55 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-21 21:08:55 +0200
commit1c2d9015da095a9c4148cd5455e9ae4e8f854674 (patch)
treeced18d61ac929307a18bbdf02842fa0a21e836d7
parentf3f42f7b8f7a9e92af57e2becfc8411dafc31af6 (diff)
downloadgitlab-ce-dz-whitelist-more-project-names-2.tar.gz
Whitelist next project names: notes, servicesdz-whitelist-more-project-names-2
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-2.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 79b2c99fd70..aec0d0ce44e 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 help ci admin search] +
+ %w[dashboard help ci admin search notes services] +
%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-2.yml b/changelogs/unreleased/dz-whitelist-more-project-names-2.yml
new file mode 100644
index 00000000000..5d5f57d79e9
--- /dev/null
+++ b/changelogs/unreleased/dz-whitelist-more-project-names-2.yml
@@ -0,0 +1,4 @@
+---
+title: 'Whitelist next project names: notes, services'
+merge_request:
+author: