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

Allow projects with dashboard as path

See merge request !8216
This commit is contained in:
Douwe Maan 2016-12-21 12:19:53 +00:00
commit f603e423f0
2 changed files with 6 additions and 1 deletions

View file

@ -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

View file

@ -0,0 +1,4 @@
---
title: Allow projects with 'dashboard' as path
merge_request:
author: