diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-12 00:13:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-12 00:13:01 +0300 |
| commit | 9643359dd3a54154ecf0cb8efab39599529aa90c (patch) | |
| tree | cdc5de4b6b9f399e0a87dc6d8378d6720509ecd7 /doc/user | |
| parent | e3f2c7cf9e327f6f6003e378593c2970f63f8d0d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/merge_requests/merge_when_pipeline_succeeds.md | 3 | ||||
| -rw-r--r-- | doc/user/project/repository/code_suggestions.md | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md index 102a2ad1c14..c6fd38e3317 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -7,6 +7,9 @@ type: reference, concepts # Merge when pipeline succeeds **(FREE)** +NOTE: +[In GitLab 16.0 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/359057), the **Merge when pipeline succeeds** and **Add to merge train when pipeline succeeds** buttons become **Set to auto-merge**. + If you review a merge request and it's ready to merge, but the pipeline hasn't completed yet, you can set it to merge when the pipeline succeeds (MWPS). You don't have to remember later to merge the work manually: diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md index 027372eb05d..c64bcdb073c 100644 --- a/doc/user/project/repository/code_suggestions.md +++ b/doc/user/project/repository/code_suggestions.md @@ -26,7 +26,7 @@ Code Suggestions are available in Visual Studio Code when you have the GitLab Wo ## Supported languages -Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality). The best results from Code Suggestions are expected for these six languages: +Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality). The best results from Code Suggestions are expected for these languages: - C/C++ - C# |