diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-06 11:17:30 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-01-06 09:22:53 -0200 |
| commit | 076cc4e32e3e5ece4013dcb340870b67f5126722 (patch) | |
| tree | dbcf3ed290e3dc1e5dd3c1f31cc714a63d5ae1a7 | |
| parent | e85d8cf6d3398ed3ce327fa64cc3c2c3789cd52f (diff) | |
| download | gitlab-ce-076cc4e32e3e5ece4013dcb340870b67f5126722.tar.gz | |
Merge branch 'dz-whitelist-some-project-names' into 'master'
Whitelist next project names: assets, profile, public
See merge request !8470
| -rw-r--r-- | app/validators/project_path_validator.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dz-whitelist-some-project-names.yml | 4 | ||||
| -rw-r--r-- | db/post_migrate/20161221153951_rename_reserved_project_names.rb | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app/validators/project_path_validator.rb b/app/validators/project_path_validator.rb index aec0d0ce44e..36279daa743 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 notes services] + + %w[dashboard help ci admin search notes services assets profile public] + %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-some-project-names.yml b/changelogs/unreleased/dz-whitelist-some-project-names.yml new file mode 100644 index 00000000000..92383646f62 --- /dev/null +++ b/changelogs/unreleased/dz-whitelist-some-project-names.yml @@ -0,0 +1,4 @@ +--- +title: 'Whitelist next project names: assets, profile, public' +merge_request: 8470 +author: diff --git a/db/post_migrate/20161221153951_rename_reserved_project_names.rb b/db/post_migrate/20161221153951_rename_reserved_project_names.rb index 7f7c2424a5c..282837be1fa 100644 --- a/db/post_migrate/20161221153951_rename_reserved_project_names.rb +++ b/db/post_migrate/20161221153951_rename_reserved_project_names.rb @@ -10,7 +10,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration KNOWN_PATHS = %w(.well-known all - assets blame blob commits @@ -18,7 +17,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration create_dir edit files - files find_file groups hooks @@ -26,11 +24,8 @@ class RenameReservedProjectNames < ActiveRecord::Migration logs_tree merge_requests new - new preview - profile projects - public raw repository robots.txt |