From efc97cbc5396d8bc06a28918e18ee0b6bfa74713 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 21 Dec 2016 12:19:53 +0000
Subject: Merge branch 'dz-whitelist-dashboard-project-path' into 'master'

Allow projects with dashboard as path

See merge request !8216
---
 app/validators/project_path_validator.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/validators/project_path_validator.rb b/app/validators/project_path_validator.rb
index 927c67b65b0..d9ab8f167d8 100644
--- 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
 
-- 
cgit v1.2.3