Add latest changes from gitlab-org/gitlab@master

2 files changed, 68 insertions, 0 deletions

diff --git a/doc/user/project/repository/mirror/troubleshooting.md b/doc/user/project/repository/mirror/troubleshooting.md
index f252c047072..3cb192800ea 100644
--- a/doc/user/project/repository/mirror/troubleshooting.md
+++ b/doc/user/project/repository/mirror/troubleshooting.md
@@ -225,3 +225,23 @@ HTTP redirects are not followed and omitting `.git` can result in a 301 error:
 ```plaintext
 13:fetch remote: "fatal: unable to access 'https://gitlab.com/group/project': The requested URL returned error: 301\n": exit status 128.
 ```
+
+## Push mirror from GitLab instance to Geo secondary fails: `The requested URL returned error: 302`
+
+Push mirroring of a GitLab repository using the HTTP or HTTPS protocols fails when the destination
+is a Geo secondary node due to the proxying of the push request to the Geo primary node,
+and the following error is displayed:
+
+```plaintext
+13:get remote references: create git ls-remote: exit status 128, stderr: "fatal: unable to access 'https://gitlab.example.com/group/destination.git/': The requested URL returned error: 302".
+```
+
+This occurs when a Geo unified URL is configured and the target host name resolves to the secondary node's IP address.
+
+The error can be avoided by:
+
+- Configuring the push mirror to use the SSH protocol. However, the repository must not contain any
+  LFS objects, which are always transferred over HTTP or HTTPS and are still redirected.
+- Using a reverse proxy to direct all requests from the source instance to the primary Geo node.
+- Adding a local `hosts` file entry on the source to force the target host name to resolve to the Geo primary node's IP address.
+- Configuring a pull mirror on the target instead.
diff --git a/doc/user/workspace/gitlab_agent_configuration.md b/doc/user/workspace/gitlab_agent_configuration.md
index bef935f2426..1bba00b4d0e 100644
--- a/doc/user/workspace/gitlab_agent_configuration.md
+++ b/doc/user/workspace/gitlab_agent_configuration.md
@@ -28,6 +28,8 @@ provided that the agent is properly configured for remote development.
 | [`network_policy`](#network_policy)                                                       | Firewall rules for workspaces.                                                                                                      |
 | [`default_resources_per_workspace_container`](#default_resources_per_workspace_container) | Default requests and limits for CPU and memory per workspace container.                                                             |
 | [`max_resources_per_workspace`](#max_resources_per_workspace)                             | Maximum requests and limits for CPU and memory per workspace.                                                                       |
+| [`workspaces_quota`](#workspaces_quota)                                                   | Maximum number of workspaces for the GitLab agent.                                                                                  |
+| [`workspaces_per_user_quota`](#workspaces_per_user_quota)                                 | Maximum number of workspaces per user.                                                                                              |
 
 NOTE:
 If a setting has an invalid value, it's not possible to update any setting until you fix that value.
@@ -202,6 +204,52 @@ remote_development:
 The maximum resources you define must include any resources required for init containers
 to perform bootstrapping operations such as cloning the project repository.
 
+### `workspaces_quota`
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/11586) in GitLab 16.9.
+
+Use this setting to set the maximum number of workspaces for the GitLab agent.
+
+You cannot create new workspaces for an agent when:
+
+- The number of workspaces for the agent has reached the defined `workspaces_quota`.
+- `workspaces_quota` is set to `0`.
+
+This setting does not affect existing workspaces for the agent.
+
+The default value is `-1` (unlimited).
+Possible values are greater than or equal to `-1`.
+
+**Example configuration:**
+
+```yaml
+remote_development:
+  workspaces_quota: 10
+```
+
+### `workspaces_per_user_quota`
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/11586) in GitLab 16.9.
+
+Use this setting to set the maximum number of workspaces per user.
+
+You cannot create new workspaces for a user when:
+
+- The number of workspaces for the user has reached the defined `workspaces_per_user_quota`.
+- `workspaces_per_user_quota` is set to `0`.
+
+This setting does not affect existing workspaces for the user.
+
+The default value is `-1` (unlimited).
+Possible values are greater than or equal to `-1`.
+
+**Example configuration:**
+
+```yaml
+remote_development:
+  workspaces_per_user_quota: 3
+```
+
 ## Configuring user access with remote development
 
 You can configure the `user_access` module to access the connected Kubernetes cluster with your GitLab credentials.