Skip to content

Commit 3bb07f4

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 7d48c9b commit 3bb07f4

File tree

35 files changed

+344
-205
lines changed

35 files changed

+344
-205
lines changed

.gitlab/ci/openapi.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ openapi-doc-check:
99
stage: lint
1010
needs: []
1111
script:
12-
- bundle exec rake gitlab:openapi:check_docs
12+
- bundle exec rake gitlab:openapi:check_docs OPENAPI_CHECK_DEBUG=true

doc/administration/geo/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ the difference between Geo and Gitaly Cluster, see [Comparison to Geo](../gitaly
124124

125125
## How it works
126126

127-
This is a brief summary of how Geo works in your GitLab environment. For a more detailed information, see the [Geo Development page](../../development/geo.md).
127+
This is a brief summary of how Geo works in your GitLab environment. For more details, see the Geo development documentation.
128128

129129
Your Geo instance can be used for cloning and fetching projects, in addition to reading any data. This makes working with large repositories over large distances much faster.
130130

doc/administration/geo/replication/datatypes.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ on a machine:
9494
GitLab does not require a special file system and can work with a mounted Storage Appliance. However, there can be
9595
performance limitations and consistency issues when using a remote file system.
9696

97-
Geo triggers garbage collection in Gitaly to [deduplicate forked repositories](../../../development/git_object_deduplication.md#git-object-deduplication-and-gitlab-geo) on Geo secondary sites.
97+
Geo triggers garbage collection in Gitaly to deduplicate forked repositories on Geo secondary sites.
9898

9999
The Gitaly gRPC API does the communication, with three possible ways of synchronization:
100100

@@ -203,8 +203,8 @@ successfully, you must replicate their data using some other means.
203203
| Feature | Replicated (added in GitLab version) | Verified (added in GitLab version) | GitLab-managed object storage replication (added in GitLab version) | GitLab-managed object storage verification (added in GitLab version) | Notes |
204204
|:----------------------------------------------------------------------------------------------------------------------|:------------------------------------------------------------------------------|:------------------------------------------------------------------------------|:--------------------------------------------------------------------------------|:--------------------------------------------------------------------------------|:------|
205205
| [Application data in PostgreSQL](../../postgresql/_index.md) | **Yes** (10.2) | **Yes** (10.2) | Not applicable | Not applicable | |
206-
| [Project repository](../../../user/project/repository/_index.md) | **Yes** (10.2) | **Yes** (10.7) | Not applicable | Not applicable | Migrated to [self-service framework](../../../development/geo/framework.md) in 16.2. See GitLab issue [#367925](https://gitlab.com/gitlab-org/gitlab/-/issues/367925) for more details.<br /><br />Behind feature flag `geo_project_repository_replication`, enabled by default in (16.3).<br /><br /> All projects, including [archived projects](../../../user/project/working_with_projects.md#archive-a-project), are replicated. |
207-
| [Project wiki repository](../../../user/project/wiki/_index.md) | **Yes** (10.2)<sup>2</sup> | **Yes** (10.7)<sup>2</sup> | Not applicable | Not applicable | Migrated to [self-service framework](../../../development/geo/framework.md) in 15.11. See GitLab issue [#367925](https://gitlab.com/gitlab-org/gitlab/-/issues/367925) for more details.<br /><br />Behind feature flag `geo_project_wiki_repository_replication`, enabled by default in (15.11). |
206+
| [Project repository](../../../user/project/repository/_index.md) | **Yes** (10.2) | **Yes** (10.7) | Not applicable | Not applicable | Migrated to self-service framework in 16.2. See GitLab issue [#367925](https://gitlab.com/gitlab-org/gitlab/-/issues/367925) for more details.<br /><br />Behind feature flag `geo_project_repository_replication`, enabled by default in (16.3).<br /><br /> All projects, including [archived projects](../../../user/project/working_with_projects.md#archive-a-project), are replicated. |
207+
| [Project wiki repository](../../../user/project/wiki/_index.md) | **Yes** (10.2)<sup>2</sup> | **Yes** (10.7)<sup>2</sup> | Not applicable | Not applicable | Migrated to self-service framework in 15.11. See GitLab issue [#367925](https://gitlab.com/gitlab-org/gitlab/-/issues/367925) for more details.<br /><br />Behind feature flag `geo_project_wiki_repository_replication`, enabled by default in (15.11). |
208208
| [Group wiki repository](../../../user/project/wiki/group.md) | [**Yes** (13.10)](https://gitlab.com/gitlab-org/gitlab/-/issues/208147) | [**Yes** (16.3)](https://gitlab.com/gitlab-org/gitlab/-/issues/323897) | Not applicable | Not applicable | Behind feature flag `geo_group_wiki_repository_replication`, enabled by default. |
209209
| [Uploads](../../uploads.md) | **Yes** (10.2) | **Yes** (14.6) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [**Yes** (16.4)<sup>3</sup>](https://gitlab.com/groups/gitlab-org/-/epics/8056) | Replication is behind the feature flag `geo_upload_replication`, enabled by default. Verification was behind the feature flag `geo_upload_verification`, removed in 14.8. |
210210
| [LFS objects](../../lfs/_index.md) | **Yes** (10.2) | **Yes** (14.6) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [**Yes** (16.4)<sup>3</sup>](https://gitlab.com/groups/gitlab-org/-/epics/8056) | GitLab versions 11.11.x and 12.0.x are affected by [a bug that prevents any new LFS objects from replicating](https://gitlab.com/gitlab-org/gitlab/-/issues/32696).<br /><br />Replication is behind the feature flag `geo_lfs_object_replication`, enabled by default. Verification was behind the feature flag `geo_lfs_object_verification`, removed in 14.7. |
@@ -232,6 +232,6 @@ successfully, you must replicate their data using some other means.
232232

233233
**Footnotes:**
234234

235-
1. Migrated to [self-service framework](../../../development/geo/framework.md) in 15.5. See GitLab issue [#337436](https://gitlab.com/gitlab-org/gitlab/-/issues/337436) for more details.
236-
1. Migrated to [self-service framework](../../../development/geo/framework.md) in 15.11. Behind feature flag `geo_project_wiki_repository_replication`, enabled by default. See GitLab issue [#367925](https://gitlab.com/gitlab-org/gitlab/-/issues/367925) for more details.
235+
1. Migrated to self-service framework in 15.5. See GitLab issue [#337436](https://gitlab.com/gitlab-org/gitlab/-/issues/337436) for more details.
236+
1. Migrated to self-service framework in 15.11. Behind feature flag `geo_project_wiki_repository_replication`, enabled by default. See GitLab issue [#367925](https://gitlab.com/gitlab-org/gitlab/-/issues/367925) for more details.
237237
1. Verification of files stored in object storage was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/8056) in GitLab 16.4 [with a feature flag](../../feature_flags.md) named `geo_object_storage_verification`, enabled by default.

doc/administration/geo/replication/troubleshooting/synchronization_verification.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ secondary Geo site, you can:
3030

3131
[You can force a resync and reverify individual items](https://gitlab.com/gitlab-org/gitlab/-/issues/364727)
3232
for all component types managed by the
33-
[self-service framework](../../../../development/geo/framework.md) using the UI. On the secondary
33+
self-service framework using the UI. On the secondary
3434
site, visit **Admin > Geo > Replication**.
3535

3636
However, if this doesn't work, you can perform the same action using the Rails console. The
@@ -469,7 +469,6 @@ destroy_artifacts_not_checksummable
469469
The `last_sync_failure` error
470470
`Error syncing repository: 13:fatal: could not read Username for 'https://gitlab.example.com': terminal prompts disabled`
471471
indicates that JWT authentication is failing during a Geo clone or fetch request.
472-
See [Geo (development) > Authentication](../../../../development/geo.md#authentication) for more context.
473472

474473
First, check that system clocks are synced. Run the [Health check Rake task](common.md#health-check-rake-task), or
475474
manually check that `date`, on all Sidekiq nodes on the secondary site and all Puma nodes on the primary site, are the

doc/administration/get_started.md

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ Unlike other monitoring solutions (for example, Zabbix or New Relic), Prometheus
105105
[these GitLab metrics](monitoring/prometheus/gitlab_metrics.md#metrics-available).
106106
- Learn more about GitLab [bundled software metrics](monitoring/prometheus/_index.md#bundled-software-metrics).
107107
- Prometheus and its exporters are on by default. However, you need to [configure the service](monitoring/prometheus/_index.md#configuring-prometheus).
108-
- Learn more about [GitLab architecture](../development/architecture.md).
109108
- Find out why [application performance metrics](https://about.gitlab.com/blog/2020/05/07/working-with-performance-metrics/) matter.
110109
- Integrate Grafana to [build visual dashboards](https://youtu.be/f4R7s0An1qE) based on performance metrics.
111110

doc/administration/maintenance_mode/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ For most JSON requests, `POST`, `PUT`, `PATCH`, and `DELETE` are blocked, and th
113113
| `POST` | `/admin/session`, `/admin/session/destroy` | To allow [Admin Mode for GitLab administrators](https://gitlab.com/groups/gitlab-org/-/epics/2158) |
114114
| `POST` | Paths ending with `/compare`| Git revision routes. |
115115
| `POST` | `.git/git-upload-pack` | To allow Git pull/clone. |
116-
| `POST` | `/api/v4/internal` | [internal API routes](../../development/internal_api/_index.md) |
116+
| `POST` | `/api/v4/internal` | internal API routes |
117117
| `POST` | `/admin/sidekiq` | To allow management of background jobs in the **Admin** area |
118118
| `POST` | `/admin/geo` | To allow updating Geo Nodes in the administrator UI |
119119
| `POST` | `/api/v4/geo_replication`| To allow certain Geo-specific administrator UI actions on secondary sites |
@@ -190,7 +190,7 @@ To monitor queues and disable jobs:
190190

191191
### Feature flags
192192

193-
- [Development feature flags](../../development/feature_flags/_index.md) cannot be turned on or off through the API, but can be toggled through the Rails console.
193+
- Development feature flags cannot be turned on or off through the API, but can be toggled through the Rails console.
194194
- [The feature flag service](../../operations/feature_flags.md) responds to feature flag checks but feature flags cannot be toggled
195195

196196
### Geo secondaries

doc/administration/silent_mode/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ Outbound communications from the following features are not silenced by Silent M
126126
| [File hooks](../file_hooks.md) | |
127127
| [Server hooks](../server_hooks.md) | |
128128
| [Advanced search](../../integration/advanced_search/elasticsearch.md) | If two GitLab instances are using the same Advanced Search instance, then they can both modify Search data. This is a split-brain scenario which can occur for example after promoting a secondary Geo site while the primary Geo site is live. |
129-
| [Snowplow](../../development/internal_analytics/product_analytics.md) | There is [a proposal to silence these requests](https://gitlab.com/gitlab-org/gitlab/-/issues/409661). |
129+
| Snowplow | There is [a proposal to silence these requests](https://gitlab.com/gitlab-org/gitlab/-/issues/409661). |
130130
| [Deprecated Kubernetes Connections](../../user/clusters/agent/_index.md) | There is [a proposal to silence these requests](https://gitlab.com/gitlab-org/gitlab/-/issues/396470). |
131131
| [Container registry webhooks](../packages/container_registry.md#configure-container-registry-notifications) | There is [a proposal to silence these requests](https://gitlab.com/gitlab-org/gitlab/-/issues/409682). |

doc/api/openapi/openapi_v2.yaml

+21-6
Original file line numberDiff line numberDiff line change
@@ -43577,6 +43577,9 @@ definitions:
4357743577
username:
4357843578
type: string
4357943579
example: admin
43580+
public_email:
43581+
type: string
43582+
4358043583
name:
4358143584
type: string
4358243585
example: Administrator
@@ -43661,6 +43664,9 @@ definitions:
4366143664
username:
4366243665
type: string
4366343666
example: admin
43667+
public_email:
43668+
type: string
43669+
4366443670
name:
4366543671
type: string
4366643672
example: Administrator
@@ -45209,6 +45215,9 @@ definitions:
4520945215
username:
4521045216
type: string
4521145217
example: admin
45218+
public_email:
45219+
type: string
45220+
4521245221
name:
4521345222
type: string
4521445223
example: Administrator
@@ -45236,8 +45245,6 @@ definitions:
4523645245
type: string
4523745246
location:
4523845247
type: string
45239-
public_email:
45240-
type: string
4524145248
skype:
4524245249
type: string
4524345250
linkedin:
@@ -48228,6 +48235,9 @@ definitions:
4822848235
username:
4822948236
type: string
4823048237
example: admin
48238+
public_email:
48239+
type: string
48240+
4823148241
name:
4823248242
type: string
4823348243
example: Administrator
@@ -48241,6 +48251,9 @@ definitions:
4824148251
username:
4824248252
type: string
4824348253
example: admin
48254+
public_email:
48255+
type: string
48256+
4824448257
name:
4824548258
type: string
4824648259
example: Administrator
@@ -49570,6 +49583,9 @@ definitions:
4957049583
username:
4957149584
type: string
4957249585
example: admin
49586+
public_email:
49587+
type: string
49588+
4957349589
name:
4957449590
type: string
4957549591
example: Administrator
@@ -49597,8 +49613,6 @@ definitions:
4959749613
type: string
4959849614
location:
4959949615
type: string
49600-
public_email:
49601-
type: string
4960249616
skype:
4960349617
type: string
4960449618
linkedin:
@@ -64688,6 +64702,9 @@ definitions:
6468864702
username:
6468964703
type: string
6469064704
example: admin
64705+
public_email:
64706+
type: string
64707+
6469164708
name:
6469264709
type: string
6469364710
example: Administrator
@@ -64715,8 +64732,6 @@ definitions:
6471564732
type: string
6471664733
location:
6471764734
type: string
64718-
public_email:
64719-
type: string
6472064735
skype:
6472164736
type: string
6472264737
linkedin:

doc/ci/components/_index.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@ For example:
144144

145145
## Use a component
146146

147+
Prerequisites:
148+
149+
If you are a member of a parent group that contains the current group or project:
150+
151+
- You must have the minimum role set by the visibility level of the project's parent group. For example, you must have at least the Reporter role if a parent project is set to **Private**.
152+
147153
To add a component to a project's CI/CD configuration, use the [`include: component`](../yaml/_index.md#includecomponent)
148154
keyword. The component reference is formatted as `<fully-qualified-domain-name>/<project-path>/<component-name>@<specific-version>`,
149155
for example:
@@ -612,7 +618,7 @@ in your project, you can select **CI/CD Catalog**.
612618
Visibility of components in the CI/CD catalog follows the component source project's
613619
[visibility setting](../../user/public_access.md). Components with source projects set to:
614620

615-
- Private are visible only to users assigned at least the Guest role for the source component project.
621+
- Private are visible only to users assigned at least the Guest role for the source component project. To use a component, you must have at least the Reporter role.
616622
- Internal are visible only to users logged into the GitLab instance.
617623
- Public are visible to anyone with access to the GitLab instance.
618624

doc/cloud_seed/_index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
stage: none
33
group: unassigned
4-
info: This is a GitLab Incubation Engineering program. No technical writer assigned to this group.
4+
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
55
title: Cloud Seed
66
---
77

@@ -20,7 +20,7 @@ title: Cloud Seed
2020
{{< /history >}}
2121

2222
Cloud Seed is an open-source program led
23-
by [GitLab Incubation Engineering](https://handbook.gitlab.com/handbook/engineering/development/incubation/) in collaboration with
23+
by GitLab in collaboration with
2424
[Google Cloud](https://cloud.google.com/).
2525

2626
Cloud Seed combines Heroku-like ease-of-use with hyper-cloud flexibility. We do this by using OAuth 2 to provision
@@ -170,7 +170,7 @@ There are several ways you can contribute to Cloud Seed:
170170

171171
- Use Cloud Seed and [share feedback](https://gitlab.com/gitlab-org/incubation-engineering/five-minute-production/feedback/-/issues/new?template=general_feedback).
172172
- If you are familiar with Ruby on Rails or Vue.js,
173-
consider [contributing to GitLab](../development/contributing/_index.md) as a developer.
173+
consider contributing to GitLab as a developer.
174174
- Much of Cloud Seed is an internal module in the GitLab codebase.
175175
- If you are familiar with GitLab pipelines, consider contributing to
176176
the [Cloud Seed Library](https://gitlab.com/gitlab-org/incubation-engineering/five-minute-production/library) project.

doc/solutions/integrations/aws_googlecloud_ollama.md

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ Key Highlights:
156156

157157
Designed for simplicity and performance, Ollama empowers users to harness the power of LLMs without the complexity of traditional AI infrastructure. Further details on setup and supported models will be covered later in the documentation.
158158

159-
- [Ollama Installation](../../development/ai_features/local_models.md)
160159
- [Ollama Model Support](https://ollama.com/search)
161160

162161
## Installation

0 commit comments

Comments
 (0)