diff --git a/changelogs/unreleased/id-merge-request-dependencies.yml b/changelogs/unreleased/id-merge-request-dependencies.yml new file mode 100644 index 0000000000000000000000000000000000000000..7532979a9f67ad753f9e8a66de36c9459cab4460 --- /dev/null +++ b/changelogs/unreleased/id-merge-request-dependencies.yml @@ -0,0 +1,5 @@ +--- +title: Allow intra-project MR dependencies +merge_request: 16799 +author: +type: changed diff --git a/doc/user/project/merge_requests/img/cross_project_dependencies_edit_inaccessible_v12_2.png b/doc/user/project/merge_requests/img/cross_project_dependencies_edit_inaccessible_v12_2.png deleted file mode 100644 index 2dc02634fd889bc23699e0136cfc4dd1510d10f4..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/cross_project_dependencies_edit_inaccessible_v12_2.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/cross_project_dependencies_edit_v12_2.png b/doc/user/project/merge_requests/img/cross_project_dependencies_edit_v12_2.png deleted file mode 100644 index 362e7e0ead279d3ad81012f9958f2d9bc898ec8a..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/cross_project_dependencies_edit_v12_2.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png b/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3699ffd16b49021b056e2b4cc917090bc30e9688 Binary files /dev/null and b/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png differ diff --git a/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png b/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png new file mode 100644 index 0000000000000000000000000000000000000000..beb452e80cf50fd36d6797c53d4d2d8ca440aa92 Binary files /dev/null and b/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png differ diff --git a/doc/user/project/merge_requests/img/cross_project_dependencies_view_v12_2.png b/doc/user/project/merge_requests/img/dependencies_view_v12_2.png similarity index 100% rename from doc/user/project/merge_requests/img/cross_project_dependencies_view_v12_2.png rename to doc/user/project/merge_requests/img/dependencies_view_v12_2.png diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 3b327472e0faee4561fca227c97f429c6bbe5d1d..52912927e073c0be9da1ee29473dbc69fd3df065 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -47,7 +47,7 @@ With **[GitLab Enterprise Edition][ee]**, you can also: - Analyze your dependencies for vulnerabilities with [Dependency Scanning](../../application_security/dependency_scanning/index.md) **(ULTIMATE)** - Analyze your Docker images for vulnerabilities with [Container Scanning](../../application_security/container_scanning/index.md) **(ULTIMATE)** - Determine the performance impact of changes with [Browser Performance Testing](#browser-performance-testing-premium) **(PREMIUM)** -- Specify merge order dependencies with [Cross-project Merge Request Dependencies](#cross-project-merge-request-dependencies-premium) **(PREMIUM)** +- Specify merge order dependencies with [Merge Request Dependencies](#merge-request-dependencies-premium) **(PREMIUM)** ## Use cases @@ -509,7 +509,7 @@ GitLab runs the [Sitespeed.io container][sitespeed-container] and displays the d [Read more about Browser Performance Testing.](browser_performance_testing.md) -## Cross-project Merge Request Dependencies **(PREMIUM)** +## Merge Request Dependencies **(PREMIUM)** > Introduced in [GitLab Premium][products] 12.2. @@ -522,7 +522,7 @@ this relationship in place, the merge request cannot be merged until all of its dependencies have also been merged, helping to maintain the consistency of a single logical change. -[Read more about cross-project merge request dependencies.](merge_request_dependencies.md) +[Read more about merge request dependencies.](merge_request_dependencies.md) ## Security reports **(ULTIMATE)** diff --git a/doc/user/project/merge_requests/merge_request_dependencies.md b/doc/user/project/merge_requests/merge_request_dependencies.md index b9f229783f111892b10ca8a937b49bf8f204fd48..f1a02e837a5e829bf6143d42ccc8f79f041f234f 100644 --- a/doc/user/project/merge_requests/merge_request_dependencies.md +++ b/doc/user/project/merge_requests/merge_request_dependencies.md @@ -2,14 +2,13 @@ type: reference, concepts --- -# Cross-project Merge Request dependencies **(PREMIUM)** +# Merge Request dependencies **(PREMIUM)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9688) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2. -Cross-project merge request dependencies allows a required order of merging -between merge requests in different projects to be expressed. If a -merge request "depends on" another, then it cannot be merged until its -dependency is itself merged. +Merge request dependencies allows a required order of merging +between merge requests to be expressed. If a merge request "depends on" another, +then it cannot be merged until its dependency is itself merged. NOTE: **Note:** Merge requests dependencies are a **PREMIUM** feature, but this restriction is @@ -58,20 +57,20 @@ instead. To continue the above example, you can configure a dependency when creating the new merge request in `awesome-project` (or by editing it, if it already exists). The dependency needs to be configured on the **dependent** merge -request. There is a "Cross-project dependencies" section in the form: +request. There is a **Merge request dependencies** section in the form: -![Cross-project dependencies form control](img/cross_project_dependencies_edit_v12_2.png) +![Merge request dependencies form control](img/dependencies_edit_v12_4.png) Anyone who can edit a merge request can change the list of dependencies. New dependencies can be added by reference, or by URL. To remove a dependency, press the **X** by its reference. -As dependencies are specified across projects, it's possible that someone else +As dependencies can be specified across projects, it's possible that someone else has added a dependency for a merge request in a project you don't have access to. These are shown as a simple count: -![Cross-project dependencies form control with inaccessible merge requests](img/cross_project_dependencies_edit_inaccessible_v12_2.png) +![Merge request dependencies form control with inaccessible merge requests](img/dependencies_edit_inaccessible_v12_4.png) If necessary, you can remove all the dependencies like this by pressing the **X**, just as you would for a single, visible dependency. @@ -82,7 +81,7 @@ or **Cancel** to return without making any changes. The list of configured dependencies, and the status of each one, is shown in the merge request widget: -![Cross-project dependencies in merge request widget](img/cross_project_dependencies_view_v12_2.png) +![Dependencies in merge request widget](img/dependencies_view_v12_2.png) Until all dependencies have, themselves, been merged, the **Merge** button will be disabled for the dependent merge request. In diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue index d1902dd9afc8936bdc849b672545df8f1faa3dce..c1e0bf1de82530a7a728e1bc5f9edb82c68b0337 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue @@ -104,7 +104,7 @@ export default { issue-item-class="p-0" >