From 25ba0c04e90a470bfdf3fe3a5b044a73157565d2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 3 Jan 2024 00:07:15 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/api/graphql/reference/index.md | 14 ++++++++++++++ doc/architecture/blueprints/ai_gateway/index.md | 6 +++--- .../troubleshooting_dependency_scanning.md | 4 ---- doc/user/project/merge_requests/changes.md | 7 +++++++ .../project/merge_requests/merge_when_pipeline_succeeds.md | 3 +++ 5 files changed, 27 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 57a33473b19..6318ef85f85 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -687,6 +687,20 @@ Returns [`Organization`](#organization). | ---- | ---- | ----------- | | `id` | [`OrganizationsOrganizationID!`](#organizationsorganizationid) | ID of the organization. | +### `Query.organizations` + +List organizations. + +WARNING: +**Introduced** in 16.8. +This feature is an Experiment. It can be changed or removed at any time. + +Returns [`OrganizationConnection`](#organizationconnection). + +This field returns a [connection](#connections). It accepts the +four standard [pagination arguments](#connection-pagination-arguments): +`before: String`, `after: String`, `first: Int`, and `last: Int`. + ### `Query.package` Find a package. This field can only be resolved for one query in any single request. Returns `null` if a package has no `default` status. diff --git a/doc/architecture/blueprints/ai_gateway/index.md b/doc/architecture/blueprints/ai_gateway/index.md index c09f8aaa621..e40861139d6 100644 --- a/doc/architecture/blueprints/ai_gateway/index.md +++ b/doc/architecture/blueprints/ai_gateway/index.md @@ -103,7 +103,7 @@ GitLab instances, JSON API, and gRPC differ on these items: | + A new Ruby-gRPC server for vscode: likely faster because we can limit dependencies to load ([modular monolith](https://gitlab.com/gitlab-org/gitlab/-/issues/365293)) | - Existing Grape API for vscode: meaning slow boot time and unneeded resources loaded | | + Bi-directional streaming | - Straight forward way to stream requests and responses (could still be added) | | - A new Python-gRPC server: we don't have experience running gRPC-Python servers | + Existing Python fastapi server, already running for Code Suggestions to extend | -| - Hard to pass on unknown messages from vscode through GitLab to ai-gateway | + Easier support for newer vscode + newer ai-gatway, through old GitLab instance | +| - Hard to pass on unknown messages from vscode through GitLab to ai-gateway | + Easier support for newer VS Code + newer AI-gateway, through old GitLab instance | | - Unknown support for gRPC in other clients (vscode, jetbrains, other editors) | + Support in all external clients | | - Possible protocol mismatch (VSCode --REST--> Rails --gRPC--> AI gateway) | + Same protocol across the stack | @@ -264,7 +264,7 @@ Another example use case includes 2 versions of a prompt passed in the `prompt_c a field in the gateway, and keep them around for at least 2 major versions of GitLab.** -A good practise that might help support backwards compatibility is to provide building blocks for the prompt inside the `prompt_components` rather then a complete prompt. By moving responsibility of compiling prompt out of building blocks on the AI-Gateway, one can achive more flexibility in terms of prompt adjustments in the future. +A good practice that might help support backward compatibility: provide building blocks for the prompt inside the `prompt_components`, rather then a complete prompt. By moving responsibility of compiling the prompt out of building blocks and into the AI-Gateway, more flexible prompt adjustments are possible in the future. #### Example feature: Code Suggestions @@ -503,7 +503,7 @@ It is deployed to a Kubernetes cluster in it's own project. There is a staging environment that is currently used directly by engineers for testing. -In the future, this will be deloyed using +In the future, this will be deployed using [Runway](https://gitlab.com/gitlab-com/gl-infra/platform/runway/). At that time, there will be a production and staging deployment. The staging deployment can be used for automated QA-runs that will have diff --git a/doc/user/application_security/dependency_scanning/troubleshooting_dependency_scanning.md b/doc/user/application_security/dependency_scanning/troubleshooting_dependency_scanning.md index 77579a04c7e..dae72e1a555 100644 --- a/doc/user/application_security/dependency_scanning/troubleshooting_dependency_scanning.md +++ b/doc/user/application_security/dependency_scanning/troubleshooting_dependency_scanning.md @@ -65,10 +65,6 @@ Consider updating to Docker `19.03.1` or greater. Older versions are not affected. Read more in [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/13830#note_211354992 "Current SAST container fails"). -## Getting warning message `gl-dependency-scanning-report.json: no matching files` - -For information, see the [general Application Security troubleshooting section](../../../ci/jobs/job_artifacts_troubleshooting.md#error-message-no-files-to-upload). - ## Limitation when using rules:exists The [dependency scanning CI template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml) diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index 780041ac411..094d2cf5730 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -162,6 +162,13 @@ per conflicted file on the merge request diff: ![Example of a conflict alert shown in a merge request diff](img/conflict_ui_v15_6.png) +## Show scanner findings in diff **(ULTIMATE ALL)** + +You can show scanner findings in the diff. For details, see: + +- [Code Quality findings](../../../ci/testing/code_quality.md#merge-request-changes-view) +- [Static Analysis findings](../../application_security/sast/index.md#merge-request-changes-view) + ## Add a comment to a merge request file > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123515) in GitLab 16.1 [with a flag](../../../administration/feature_flags.md) named `comment_on_files`. Enabled by default. 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 a9cad78449b..3a2729bd64b 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -23,6 +23,9 @@ author can either retry any failed jobs, or push new commits to fix the failure: - If a retried job succeeds on the second try, the merge request is merged. - If new commits are added to the merge request, GitLab cancels the request to ensure the new changes are reviewed before merge. +- If new commits are added to the target branch of the merge request and + fast-forward only merge request is configured, GitLab cancels the request + to prevent merge conflicts. ## Auto-merge a merge request -- cgit v1.2.3