diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-12-21 15:19:53 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 15:38:22 +0300 |
| commit | efc97cbc5396d8bc06a28918e18ee0b6bfa74713 (patch) | |
| tree | 131b512148e841834091bff88542e20970528ec3 /app | |
| parent | f62c8f7ccdce9bcfaf66ef3e2933a3553888cce5 (diff) | |
Merge branch 'dz-whitelist-dashboard-project-path' into 'master'
Allow projects with dashboard as path
See merge request !8216
Diffstat (limited to 'app')
| -rw-r--r-- | app/validators/project_path_validator.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |