Merge branch 'dz-whitelist-more-project-names' into 'master'

Whitelist more project names See merge request !8227

Merge branch 'dz-whitelist-more-project-names' into 'master'
3de40e03 · Douwe Maan · 815e01cc · e1bf40e2 · 3de40e03 · 3de40e03
Commit 3de40e03 authored Dec 21, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

project_path_validator.rb app/validators/project_path_validator.rb +1 -1

dz-whitelist-more-project-names.yml changelogs/unreleased/dz-whitelist-more-project-names.yml +4 -0

No files found.
--- 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


--- a/changelogs/unreleased/dz-whitelist-more-project-names.yml
+++ b/changelogs/unreleased/dz-whitelist-more-project-names.yml
+---
+title: 'Whitelist next project names: help, ci, admin, search'
+merge_request: 8227
+author: