Skip to content

G
gitlab-ce
Commit efc97cbc authored by Douwe Maan's avatar Douwe Maan Committed by Douglas Barbosa Alexandre
Browse files
Options

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

Allow projects with dashboard as path

See merge request !8216
parent f62c8f7c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
app/validators/project_path_validator.rb
View file @ efc97cbc
...@@ -14,7 +14,8 @@ class ProjectPathValidator < ActiveModel::EachValidator ...@@ -14,7 +14,8 @@ class ProjectPathValidator < ActiveModel::EachValidator
# without tree as reserved name routing can match 'group/project' as group name, # without tree as reserved name routing can match 'group/project' as group name,
# 'tree' as project name and 'deploy_keys' as route. # '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 %w[tree commits wikis new edit create update logs_tree
preview blob blame raw files create_dir find_file]).freeze preview blob blame raw files create_dir find_file]).freeze
......
changelogs/unreleased/dz-whitelist-dashboard-project-path.yml 0 → 100644
View file @ efc97cbc
---
title: Allow projects with 'dashboard' as path
merge_request:
author:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7