diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-22 08:36:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-22 08:36:25 +0000 |
| commit | 6d9c1d3efce00da95832feaaf36227bcbffecadf (patch) | |
| tree | 8a97072e15a694577c6830a81ead347a0a42693e | |
| parent | 7ab79dff9f02b9ed4e5d64880958e48098300665 (diff) | |
| parent | 1c2d9015da095a9c4148cd5455e9ae4e8f854674 (diff) | |
| download | gitlab-ce-6d9c1d3efce00da95832feaaf36227bcbffecadf.tar.gz | |
Merge branch 'dz-whitelist-more-project-names-2' into 'master'
Whitelist next project names: notes, services
See merge request !8239
| -rw-r--r-- | app/validators/project_path_validator.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dz-whitelist-more-project-names-2.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 79b2c99fd70..aec0d0ce44e 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 help ci admin search] + + %w[dashboard help ci admin search notes services] + %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-2.yml b/changelogs/unreleased/dz-whitelist-more-project-names-2.yml new file mode 100644 index 00000000000..5d5f57d79e9 --- /dev/null +++ b/changelogs/unreleased/dz-whitelist-more-project-names-2.yml @@ -0,0 +1,4 @@ +--- +title: 'Whitelist next project names: notes, services' +merge_request: +author: |