diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-12-21 16:45:47 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-12-21 16:45:47 +0000 |
| commit | 3de40e03ec1c15148a12ced92fb92bb69fbbe763 (patch) | |
| tree | e9c7e75f35fbefda66d3c0988ab2c36df85f2c25 | |
| parent | 815e01ccb1d24c8577000af836de6675d184da4c (diff) | |
| parent | e1bf40e293409d974a8013685ec544c0f633ef16 (diff) | |
| download | gitlab-ce-3de40e03ec1c15148a12ced92fb92bb69fbbe763.tar.gz | |
Merge branch 'dz-whitelist-more-project-names' into 'master'
Whitelist more project names
See merge request !8227
| -rw-r--r-- | app/validators/project_path_validator.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dz-whitelist-more-project-names.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/validators/project_path_validator.rb b/app/validators/project_path_validator.rb index d9ab8f167d8..79b2c99fd70 100644 --- a/app/validators/project_path_validator.rb +++ b/app/validators/project_path_validator.rb @@ -15,7 +15,7 @@ class ProjectPathValidator < ActiveModel::EachValidator # 'tree' as project name and 'deploy_keys' as route. # RESERVED = (NamespaceValidator::RESERVED - - %w[dashboard] + + %w[dashboard help ci admin search] + %w[tree commits wikis new edit create update logs_tree preview blob blame raw files create_dir find_file]).freeze diff --git a/changelogs/unreleased/dz-whitelist-more-project-names.yml b/changelogs/unreleased/dz-whitelist-more-project-names.yml new file mode 100644 index 00000000000..4a3f1511a0b --- /dev/null +++ b/changelogs/unreleased/dz-whitelist-more-project-names.yml @@ -0,0 +1,4 @@ +--- +title: 'Whitelist next project names: help, ci, admin, search' +merge_request: 8227 +author: |