diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2019-08-12 04:23:01 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-08-12 04:23:01 +0000 |
| commit | 60dfca155c205a0fad1cac367f7225100cb555eb (patch) | |
| tree | b5b79fe61c48973e55e003a477cf8d4f2f9c4e80 /doc/user/project/merge_requests | |
| parent | c3fddfc1285cad9a04a70405aede2f0952140115 (diff) | |
| download | gitlab-ce-60dfca155c205a0fad1cac367f7225100cb555eb.tar.gz | |
Add more rules to markdown lint check
Adds MD010 (Hard tabs), MD012 (blank lines), MD029 (ordered
list prefix), MD030 (spaces after list markers), and fixes
remaining docs that were failing these tests
Diffstat (limited to 'doc/user/project/merge_requests')
| -rw-r--r-- | doc/user/project/merge_requests/merge_request_dependencies.md | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/user/project/merge_requests/merge_request_dependencies.md b/doc/user/project/merge_requests/merge_request_dependencies.md index 45cb56dfb6b..e046b3466c4 100644 --- a/doc/user/project/merge_requests/merge_request_dependencies.md +++ b/doc/user/project/merge_requests/merge_request_dependencies.md @@ -23,11 +23,11 @@ merge requests in the same project cannot depend on each other. ## Use cases -* Ensure changes to a library are merged before changes to a project that +- Ensure changes to a library are merged before changes to a project that imports the library -* Prevent a documentation-only merge request from being merged before the merge request +- Prevent a documentation-only merge request from being merged before the merge request implementing the feature to be documented -* Require an merge request updating a permissions matrix to be merged before merging an +- Require an merge request updating a permissions matrix to be merged before merging an merge request from someone who hasn't yet been granted permissions It is common for a single logical change to span several merge requests, spread @@ -97,9 +97,9 @@ merge. ## Limitations -* API support: [gitlab-ee#12551](https://gitlab.com/gitlab-org/gitlab-ee/issues/12551) -* Dependencies are not preserved across project export/import: [gitlab-ee#12549](https://gitlab.com/gitlab-org/gitlab-ee/issues/12549) -* Complex merge order dependencies are not supported: [gitlab-ee#11393](https://gitlab.com/gitlab-org/gitlab-ee/issues/11393) +- API support: [gitlab-ee#12551](https://gitlab.com/gitlab-org/gitlab-ee/issues/12551) +- Dependencies are not preserved across project export/import: [gitlab-ee#12549](https://gitlab.com/gitlab-org/gitlab-ee/issues/12549) +- Complex merge order dependencies are not supported: [gitlab-ee#11393](https://gitlab.com/gitlab-org/gitlab-ee/issues/11393) The last item merits a little more explanation. Dependencies between merge requests can be described as a graph of relationships. The simplest possible @@ -122,7 +122,6 @@ graph LR; Several different merge requests can also directly depend upon the same merge request: - ```mermaid graph LR; herfriend/another-lib!1-->myfriend/awesome-lib!10; |