diff options
Diffstat (limited to 'doc/user')
6 files changed, 28 insertions, 4 deletions
diff --git a/doc/user/clusters/agent/gitops/flux_oci_tutorial.md b/doc/user/clusters/agent/gitops/flux_oci_tutorial.md index e1832de51af..09e844e448a 100644 --- a/doc/user/clusters/agent/gitops/flux_oci_tutorial.md +++ b/doc/user/clusters/agent/gitops/flux_oci_tutorial.md @@ -106,7 +106,7 @@ To configure, create an [`OCIRepository`](https://fluxcd.io/flux/components/sour with the following contents: ```yaml - apiVersion: source.toolkit.fluxcd.io/v1 + apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: OCIRepository metadata: name: web-app-manifests diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index dece5600b0d..345d937ed8c 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -229,6 +229,7 @@ An administrator can make this option the default in the project's settings. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9. > - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9. > - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) GitLab 13.10. +> - Chained merge requests [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/323329) to automatically rebase on the new target branch in GitLab 16.9. Merge requests are often chained together, with one merge request depending on the code added or changed in another merge request. To support keeping individual @@ -240,7 +241,7 @@ target branch merges into `main`. For example: If these merge requests are open at the same time, and merge request 1 (`feature-alpha`) merges into `main`, GitLab updates the destination of merge request 2 from `feature-alpha` -to `main`. +to `main` and then rebases the source branch onto the new target branch. Merge requests with interconnected content updates are usually handled in one of these ways: diff --git a/doc/user/project/repository/code_suggestions/index.md b/doc/user/project/repository/code_suggestions/index.md index ed9eeac1c2c..8f995dc6508 100644 --- a/doc/user/project/repository/code_suggestions/index.md +++ b/doc/user/project/repository/code_suggestions/index.md @@ -11,13 +11,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w > - [Introduced support for Code Generation](https://gitlab.com/gitlab-org/gitlab/-/issues/415583) in GitLab 16.3. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7. +NOTE: +Starting in February 2024, Code Suggestions will be part of +[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/), +available to Premium and Ultimate users for purchase now. + Write code more efficiently by using generative AI to suggest code while you're developing. With [GitLab Duo Code Suggestions](https://about.gitlab.com/solutions/code-suggestions/), you get: - Code Completion, which suggests completions to the current line you are typing. These suggestions are usually low latency. - Code Generation, which generates code based on a natural language code - comment block. Write a comment like `# Type more here` to generate the + comment block. Write a comment like `# Type more here`, then press <kbd>Enter</kbd> to generate the appropriate code, based on the context of your comment and the rest of your code. - Algorithms or large code blocks may take more than 10 seconds to generate. - Streaming of code generation responses is supported in VS Code, leading to faster average response times. Other supported IDEs offer slower response times and will return the generated code in a single block. @@ -66,8 +71,10 @@ The editor supports these languages: |------------------|------------------------|------------------------|------------------------|--------| | C++ | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | C# | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | +| CSS | **{check-circle}** No | **{check-circle}** Yes | **{check-circle}** No | **{check-circle}** No | | Go | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | Google SQL | **{dotted-circle}** No | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | +| HTML | **{check-circle}** No | **{check-circle}** Yes | **{check-circle}** No | **{check-circle}** No | | Java | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | JavaScript | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | Kotlin | **{check-circle}** Yes (Requires third-party extension providing Kotlin support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | @@ -76,6 +83,7 @@ The editor supports these languages: | Ruby | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | Rust | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | Scala | **{check-circle}** Yes (Requires third-party extension providing Scala support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | +| Shell scripts (`bash` only) | **{check-circle}** No | **{check-circle}** Yes | **{check-circle}** No | **{check-circle}** No | | Swift | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | TypeScript | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | | Terraform | **{check-circle}** Yes (Requires third-party extension providing Terraform support) | **{check-circle}** Yes | **{dotted-circle}** No | **{check-circle}** Yes (Requires third-party extension providing the `terraform` file type) | diff --git a/doc/user/project/repository/code_suggestions/repository_xray.md b/doc/user/project/repository/code_suggestions/repository_xray.md index 465bfc8d16a..356b0958344 100644 --- a/doc/user/project/repository/code_suggestions/repository_xray.md +++ b/doc/user/project/repository/code_suggestions/repository_xray.md @@ -6,7 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Repository X-Ray **(PREMIUM ALL)** -> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12060) in GitLab 16.7. +> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12060) in GitLab 16.7. + +NOTE: +Starting in February 2024, Code Suggestions will be part of +[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/), +available to Premium and Ultimate users for purchase now. Repository X-Ray enhances [GitLab Duo Code Suggestions](index.md) by providing additional context to improve the accuracy and relevance of code recommendations. diff --git a/doc/user/project/repository/code_suggestions/saas.md b/doc/user/project/repository/code_suggestions/saas.md index 4b1cc762406..a0556d00822 100644 --- a/doc/user/project/repository/code_suggestions/saas.md +++ b/doc/user/project/repository/code_suggestions/saas.md @@ -13,6 +13,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7. +NOTE: +Starting in February 2024, Code Suggestions will be part of +[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/), +available to Premium and Ultimate users for purchase now. + Write code more efficiently by using generative AI to suggest code while you're developing. Usage of GitLab Duo Code Suggestions is governed by the [GitLab Testing Agreement](https://about.gitlab.com/handbook/legal/testing-agreement/). diff --git a/doc/user/project/repository/code_suggestions/self_managed.md b/doc/user/project/repository/code_suggestions/self_managed.md index 8cd499c13d0..e14d4197cd9 100644 --- a/doc/user/project/repository/code_suggestions/self_managed.md +++ b/doc/user/project/repository/code_suggestions/self_managed.md @@ -12,6 +12,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w > - Code Suggestions in the GitLab WebIDE enabled for all GitLab-hosted customers. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7. +NOTE: +Starting in February 2024, Code Suggestions will be part of +[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/), +available to Premium and Ultimate users for purchase now. + Write code more efficiently by using generative AI to suggest code while you're developing. GitLab Duo Code Suggestions are available on GitLab Enterprise Edition. |