diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-04-05 15:41:00 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-01 11:14:24 +0200 |
| commit | 74fcccaab30ac0f9e11ed9a076c008ade13a50d0 (patch) | |
| tree | e3341f6aa020659655b2b6941fe8660befe315bf /lib/constraints | |
| parent | 536f2bdfd17ac3bab38851de2973dd1c89dccc3f (diff) | |
| download | gitlab-ce-74fcccaab30ac0f9e11ed9a076c008ade13a50d0.tar.gz | |
Streamline the path validation in groups & projects
`Project` uses `ProjectPathValidator` which is now a
`NamespaceValidator` that skips the format validation.
That way we're sure we are using the same collection of reserved
paths.
I updated the path constraints to reflect the changes: We now allow
some values that are only used on a top level namespace as a name for
a nested group/project.
Diffstat (limited to 'lib/constraints')
| -rw-r--r-- | lib/constraints/group_url_constrainer.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/constraints/group_url_constrainer.rb b/lib/constraints/group_url_constrainer.rb index bae4db1ca4d..559f510944a 100644 --- a/lib/constraints/group_url_constrainer.rb +++ b/lib/constraints/group_url_constrainer.rb @@ -2,16 +2,8 @@ class GroupUrlConstrainer def matches?(request) id = request.params[:id] - return false unless valid?(id) + return false unless NamespaceValidator.valid_full_path?(id) Group.find_by_full_path(id).present? end - - private - - def valid?(id) - id.split('/').all? do |namespace| - NamespaceValidator.valid?(namespace) - end - end end |