-
- Downloads
Merge branch 'dm-fix-routes' into 'master'
Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
Showing
- app/models/project.rb 1 addition, 1 deletionapp/models/project.rb
- app/validators/dynamic_path_validator.rb 15 additions, 188 deletionsapp/validators/dynamic_path_validator.rb
- config/routes/admin.rb 3 additions, 1 deletionconfig/routes/admin.rb
- config/routes/git_http.rb 3 additions, 1 deletionconfig/routes/git_http.rb
- config/routes/project.rb 16 additions, 1 deletionconfig/routes/project.rb
- config/routes/user.rb 3 additions, 3 deletionsconfig/routes/user.rb
- doc/user/group/subgroups/index.md 3 additions, 3 deletionsdoc/user/group/subgroups/index.md
- lib/constraints/group_url_constrainer.rb 2 additions, 2 deletionslib/constraints/group_url_constrainer.rb
- lib/constraints/project_url_constrainer.rb 1 addition, 1 deletionlib/constraints/project_url_constrainer.rb
- lib/gitlab/etag_caching/router.rb 1 addition, 1 deletionlib/gitlab/etag_caching/router.rb
- lib/gitlab/regex.rb 189 additions, 6 deletionslib/gitlab/regex.rb
- spec/controllers/import/gitlab_controller_spec.rb 1 addition, 1 deletionspec/controllers/import/gitlab_controller_spec.rb
- spec/lib/gitlab/regex_spec.rb 368 additions, 0 deletionsspec/lib/gitlab/regex_spec.rb
- spec/models/namespace_spec.rb 1 addition, 1 deletionspec/models/namespace_spec.rb
- spec/routing/project_routing_spec.rb 4 additions, 0 deletionsspec/routing/project_routing_spec.rb
- spec/validators/dynamic_path_validator_spec.rb 24 additions, 224 deletionsspec/validators/dynamic_path_validator_spec.rb
Loading
Please register or sign in to comment