Merge branch 'dz-whitelist-dashboard-project-path' into 'master'

Allow projects with dashboard as path See merge request !8216

Merge branch 'dz-whitelist-dashboard-project-path' into 'master'
f603e423 · Douwe Maan · 0ba41ea1 · 8b92e9c0 · f603e423 · f603e423
Commit f603e423 authored Dec 21, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

dz-whitelist-dashboard-project-path.yml ...gelogs/unreleased/dz-whitelist-dashboard-project-path.yml +4 -0

No files found.
--- a/app/validators/project_path_validator.rb
+++ b/app/validators/project_path_validator.rb
@@ -14,7 +14,8 @@ class ProjectPathValidator < ActiveModel::EachValidator
  #  without tree as reserved name routing can match 'group/project' as group name,
  #  'tree' as project name and 'deploy_keys' as route.
  #
-  RESERVED = (NamespaceValidator::RESERVED +
+  RESERVED = (NamespaceValidator::RESERVED -
+              %w[dashboard] +
              %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-dashboard-project-path.yml
+++ b/changelogs/unreleased/dz-whitelist-dashboard-project-path.yml
+---
+title: Allow projects with 'dashboard' as path
+merge_request: 
+author: