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

Whitelist next project names: notes, services See merge request !8239

Merge branch 'dz-whitelist-more-project-names-2' into 'master'
Whitelist next project names: notes, services See merge request !8239
8d516e63 · Dmitriy Zaporozhets · Douglas Barbosa Alexandre · 5f118980 · 8d516e63 · 8d516e63
Commit 8d516e63 authored Dec 22, 2016 by Dmitriy Zaporozhets Committed by Douglas Barbosa Alexandre Dec 22, 2016
Showing with 5 additions and 1 deletion

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

changelogs/unreleased/dz-whitelist-more-project-names-2.yml changelogs/unreleased/dz-whitelist-more-project-names-2.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 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


--- a/changelogs/unreleased/dz-whitelist-more-project-names-2.yml
+++ b/changelogs/unreleased/dz-whitelist-more-project-names-2.yml
+---
+title: 'Whitelist next project names: notes, services'
+merge_request:
+author: