diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-17 10:42:55 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-17 10:42:55 +0000 |
| commit | a5f0656392699dad7677a368c315217ea99b3982 (patch) | |
| tree | 12f0ee7d9d62adfc55b27c45b6cdc3911098734b | |
| parent | 9fde881dc0a5388f5a1cba8acbb907062ee9df0c (diff) | |
| parent | 968e50755b6db85e393b2042b4450d64b6510537 (diff) | |
| download | gitlab-ce-a5f0656392699dad7677a368c315217ea99b3982.tar.gz | |
Merge branch 'bvl-docs-dynamic-path-validator' into 'master'
Update documentation on reserved words for groups and projects
See merge request !11432
| -rw-r--r-- | doc/user/group/subgroups/index.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index ce5da07c61a..a4726673fc4 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -71,8 +71,10 @@ structure. - You need to be an Owner of a group in order to be able to create a subgroup. For more information check the [permissions table][permissions]. - For a list of words that are not allowed to be used as group names see the - [`namespace_validator.rb` file][reserved] under the `RESERVED` and - `WILDCARD_ROUTES` lists. + [`dynamic_path_validator.rb` file][reserved] under the `TOP_LEVEL_ROUTES`, `WILDCARD_ROUTES` and `GROUP_ROUTES` lists: + - `TOP_LEVEL_ROUTES`: are names that are reserved as usernames or top level groups + - `WILDCARD_ROUTES`: are names that are reserved for child groups or projects. + - `GROUP_ROUTES`: are names that are reserved for all groups or projects. To create a subgroup: @@ -161,4 +163,4 @@ Here's a list of what you can't do with subgroups: [ce-2772]: https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 [permissions]: ../../permissions.md#group -[reserved]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/validators/namespace_validator.rb +[reserved]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/validators/dynamic_path_validator.rb |