Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-23Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-06-23Nick Thomas
2017-06-21Rebuild the dynamic path before validating itBob Van Landuyt
Otherwise we won't validate updates to the path. Allowing users to change the path to something that's not allowed.
2017-06-02Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-02Rémy Coutable
# Conflicts: # app/assets/javascripts/boards/boards_bundle.js # app/assets/javascripts/boards/filtered_search_boards.js # app/assets/javascripts/dispatcher.js # app/assets/javascripts/environments/stores/environments_store.js # app/assets/javascripts/vue_merge_request_widget/dependencies.js # app/controllers/autocomplete_controller.rb # app/models/project.rb # app/models/user.rb # app/services/ci/create_pipeline_service.rb # app/services/git_push_service.rb # app/services/git_tag_push_service.rb # app/views/projects/jobs/_sidebar.html.haml # app/views/projects/jobs/show.html.haml # db/schema.rb # doc/api/projects.md # lib/gitlab/etag_caching/router.rb # lib/gitlab/utils.rb # spec/controllers/autocomplete_controller_spec.rb # spec/features/issues/form_spec.rb # spec/features/projects/jobs_spec.rb # spec/javascripts/environments/environments_store_spec.js # spec/lib/gitlab/utils_spec.rb # spec/services/git_push_service_spec.rb # spec/support/test_env.rb [ci skip]
2017-06-02Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt
2017-05-30Avoid crash when trying to parse string with invalid UTF-8 sequenceBob Van Landuyt
2017-05-29Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-05-25Merge remote-tracking branch 'ce/master' into nt/ce-to-ee-thursdayNick Thomas
2017-05-24Revert "Remove changes that are not absolutely necessary"Douwe Maan
This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
2017-05-24Remove changes that are not absolutely necessaryDouwe Maan
2017-05-24Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan
2017-05-04Order rejected paths like in EEBob Van Landuyt
To avoid merge conflicts
2017-05-04Reject EE reserved namespace paths in CE as wellBob Van Landuyt
2017-05-02Reject EE-specific group pathsBob Van Landuyt
2017-05-02Reject more reserved pathsBob Van Landuyt
And validate if new paths need to be added. This is a port to EE of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10413 to EE
2017-05-02Don't validate reserved words if the format doesn't matchBob Van Landuyt
Because it also won't match the sophisticated format we have for detecting reserved names. We don't want to confuse the user with 2 error messages
2017-05-02Update commentsBob Van Landuyt
2017-05-02Update path validation & specsBob Van Landuyt
2017-05-02Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidatorBob Van Landuyt
2017-05-01Reject group-routes as names of child namespacesBob Van Landuyt
2017-05-01Reject paths following namespace for paths including 2 `*`Bob Van Landuyt
Reject the part following `/*namespace_id/:project_id` for paths containing 2 wildcard parameters
2017-05-01Allow `graphs` & `refs` project namesBob Van Landuyt
2017-05-01Minor style adjustmentsBob Van Landuyt
2017-05-01Use `%r{}` regexes to avoid having to escape `/`Bob Van Landuyt
2017-05-01The dynamic path validator can block out partial pathsBob Van Landuyt
So we can block `objects` only when it is contained in `info/lfs` or `gitlab-lfs`
2017-05-01Make path validation case-insensitiveBob Van Landuyt
2017-05-01Reject `-` as a pathBob Van Landuyt
2017-05-01Rename `NamespaceValidator` to `DynamicPathValidator`Bob Van Landuyt
This reflects better that it validates paths instead of a namespace model
2017-05-01Use the namespace validator for validating all pathsBob Van Landuyt
Since the namespacevalidator now knows the difference between a top-level and another path, this could all be handled there.
2017-05-01Check `has_parent?` for determining validation typeBob Van Landuyt
2017-05-01Split off validating full pathsBob Van Landuyt
The first part of a full path needs to be validated as a `top_level` while the rest need to be validated as `wildcard`
2017-05-01 Improve detection of reserved words from routesBob Van Landuyt
2017-05-01Streamline the path validation in groups & projectsBob Van Landuyt
`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.
2017-05-01Add forbidden paths to the namespace validatorBob Van Landuyt
2017-05-01Disallow some more namespacesBob Van Landuyt
These routes seem to be taken
2017-04-07Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-fridayRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-06Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.Shinya Maeda
2017-04-06Separate cron_valid? and cron_time_zone_valid?Shinya Maeda
2017-04-06Move Ci::CronParser to Gitlab::Ci::CronParserShinya Maeda
2017-04-06Add Import/Export Setting for trigger_schedule. Remove ref validation.Shinya Maeda
2017-04-06Fix rubocop issues. Use add_concurrent_foreign_key.Shinya Maeda
2017-04-06Add validatorShinya Maeda
2017-03-21Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci ↵Valery Sizov
skip]
2017-03-21Merge branch 'ssrf' into 'security' Douwe Maan
Protect server against SSRF in project import URLs See merge request !2068
2017-03-15Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-wednesdayRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-13Reserve few project and nested group pathsDmitriy Zaporozhets
That have wildcard routes associated and not reserved yet: artifacts, graphs, badges and refs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-09Merge remote-tracking branch 'ce/master' into ce-to-eeNick Thomas
2017-03-07Restrict nested group names to prevent ambiguous routesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-24Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-fridayRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-24Introduce DurationValidator, feedback:Lin Jen-Shin
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_24032923
2017-02-23Enable Style/MutableConstantDouwe Maan