diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 18:07:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 18:07:07 +0300 |
commit | 9a1c5456747a7b5b218b8b44e4b43396bf7fd705 (patch) | |
tree | dc5873f33437c897389e923a59365fb192d87fb8 /doc/user | |
parent | 927cfbfe63dd3dc64df9d341d7c4328a2fe3597f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/monitoring/health_check.md | 3 | ||||
-rw-r--r-- | doc/user/project/merge_requests/img/cross_project_dependencies_edit_inaccessible_v12_2.png | bin | 19461 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/img/cross_project_dependencies_edit_v12_2.png | bin | 19302 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png | bin | 0 -> 55947 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/img/dependencies_edit_v12_4.png | bin | 0 -> 53561 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/img/dependencies_view_v12_2.png (renamed from doc/user/project/merge_requests/img/cross_project_dependencies_view_v12_2.png) | bin | 37528 -> 37528 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/index.md | 6 | ||||
-rw-r--r-- | doc/user/project/merge_requests/merge_request_dependencies.md | 19 |
8 files changed, 15 insertions, 13 deletions
diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md index 3fbfba2f839..6439607de33 100644 --- a/doc/user/admin_area/monitoring/health_check.md +++ b/doc/user/admin_area/monitoring/health_check.md @@ -102,6 +102,9 @@ Example response: ## Liveness +DANGER: **Warning:** +In Gitlab [12.4](https://about.gitlab.com/upcoming-releases/) the response body of the Liveness check will change to match the example below. + The liveness probe checks whether the application server is alive. Unlike the [`health`](#health) check, this check hits the database. ```text 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 Binary files differdeleted file mode 100644 index 2dc02634fd8..00000000000 --- a/doc/user/project/merge_requests/img/cross_project_dependencies_edit_inaccessible_v12_2.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 362e7e0ead2..00000000000 --- a/doc/user/project/merge_requests/img/cross_project_dependencies_edit_v12_2.png +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000000..3699ffd16b4 --- /dev/null +++ b/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png 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 Binary files differnew file mode 100644 index 00000000000..beb452e80cf --- /dev/null +++ b/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png 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 Binary files differindex e00231c839b..e00231c839b 100644 --- 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 diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 3b327472e0f..52912927e07 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 b9f229783f1..f1a02e837a5 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 |