Add latest changes from gitlab-org/gitlab@master

5 files changed, 24 insertions, 7 deletions

diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 2ed55c9803c..9e98d0d8069 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -11097,7 +11097,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="groupadditionalpurchasedstoragesize"></a>`additionalPurchasedStorageSize` | [`Float`](#float) | Additional storage purchased for the root namespace in bytes. |
 | <a id="groupautodevopsenabled"></a>`autoDevopsEnabled` | [`Boolean`](#boolean) | Indicates whether Auto DevOps is enabled for all projects within this group. |
 | <a id="groupavatarurl"></a>`avatarUrl` | [`String`](#string) | Avatar URL of the group. |
-| <a id="groupbillablememberscount"></a>`billableMembersCount` | [`Int`](#int) | Number of billable users in the group. |
 | <a id="groupcontacts"></a>`contacts` | [`CustomerRelationsContactConnection`](#customerrelationscontactconnection) | Find contacts of this group. (see [Connections](#connections)) |
 | <a id="groupcontainerrepositoriescount"></a>`containerRepositoriesCount` | [`Int!`](#int) | Number of container repositories in the group. |
 | <a id="groupcontainslockedprojects"></a>`containsLockedProjects` | [`Boolean!`](#boolean) | Includes at least one project where the repository size exceeds the limit. |
@@ -11151,6 +11150,18 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 #### Fields with arguments
 
+##### `Group.billableMembersCount`
+
+Number of billable users in the group.
+
+Returns [`Int`](#int).
+
+###### Arguments
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="groupbillablememberscountrequestedhostedplan"></a>`requestedHostedPlan` | [`String`](#string) | Plan from which to get billable members. |
+
 ##### `Group.board`
 
 A single board of the group.
diff --git a/doc/install/index.md b/doc/install/index.md
index f4d8490d3a4..b27d3683cd5 100644
--- a/doc/install/index.md
+++ b/doc/install/index.md
@@ -27,7 +27,7 @@ install GitLab:
 
 | Installation method                                            | Description | When to choose |
 |----------------------------------------------------------------|-------------|----------------|
-| [Linux package](https://docs.gitlab.com/omnibus/installation/) | The official deb/rpm packages (also known as Omnibus GitLab) that contains a bundle of GitLab and the components it depends on, including PostgreSQL, Redis, and Sidekiq. | This is the recommended method for getting started. The Linux packages are mature, scalable, and are used today on GitLab.com. If you need additional flexibility and resilience, we recommend deploying GitLab as described in the [reference architecture documentation](../administration/reference_architectures/index.md). |
+| [Linux package](https://docs.gitlab.com/omnibus/installation/) | The official deb/rpm packages (also known as Omnibus GitLab) that contains a bundle of GitLab and the components it depends on, including PostgreSQL, Redis, and Sidekiq. | This method is recommended for getting started. The Linux packages are mature, scalable, and are used today on GitLab.com. If you need additional flexibility and resilience, we recommend deploying GitLab as described in the [reference architecture documentation](../administration/reference_architectures/index.md). |
 | [Helm charts](https://docs.gitlab.com/charts/)                 | The cloud native Helm chart for installing GitLab and all of its components on Kubernetes. | When installing GitLab on Kubernetes, there are some trade-offs that you need to be aware of: <br/>- Administration and troubleshooting requires Kubernetes knowledge.<br/>- It can be more expensive for smaller installations. The default installation requires more resources than a single node Linux package deployment, as most services are deployed in a redundant fashion.<br/><br/> Use this method if your infrastructure is built on Kubernetes and you're familiar with how it works. The methods for management, observability, and some concepts are different than traditional deployments. |
 | [Docker](https://docs.gitlab.com/omnibus/docker/)              | The GitLab packages, Dockerized. | Use this method if you're familiar with Docker. |
 | [Source](installation.md)                                      | Install GitLab and all of its components from scratch. | Use this method if none of the previous methods are available for your platform. Useful for unsupported systems like \*BSD.|
diff --git a/doc/topics/offline/quick_start_guide.md b/doc/topics/offline/quick_start_guide.md
index 82d7896d4d2..d1be775268f 100644
--- a/doc/topics/offline/quick_start_guide.md
+++ b/doc/topics/offline/quick_start_guide.md
@@ -14,7 +14,7 @@ instance entirely offline.
 NOTE:
 This guide assumes the server is Ubuntu 20.04 using the [Omnibus installation method](https://docs.gitlab.com/omnibus/) and will be running GitLab [Enterprise Edition](https://about.gitlab.com/install/ce-or-ee/). Instructions for other servers may vary.
 This guide also assumes the server host resolves as `my-host.internal`, which you should replace with your
-server's FQDN, and that you have acess to a different server with Internet access to download the required package files. 
+server's FQDN, and that you have access to a different server with Internet access to download the required package files. 
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For a video walkthrough of this process, see [Offline GitLab Installation: Downloading & Installing](https://www.youtube.com/watch?v=TJaq4ua2Prw).
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index e045b77efff..e823391401d 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -147,7 +147,7 @@ GitLab webhooks, keep in mind the following:
   Most HTTP libraries take care of the response for you automatically but if
   you are writing a low-level hook, this is important to remember.
 - GitLab usually ignores the HTTP status code returned by your endpoint,
-  unless the `web_hooks_disable_failed` feature flag is set.
+  unless the [`web_hooks_disable_failed` feature flag is set](#failing-webhooks).
 
 ### Failing webhooks
 
@@ -251,8 +251,8 @@ If the endpoint doesn't send an HTTP response in those 10 seconds,
 GitLab may assume the webhook failed and retry it.
 
 If your webhooks are failing or you are receiving multiple requests,
-you can try changing the default timeout value.
-In your `/etc/gitlab/gitlab.rb` file, uncomment or add the following setting:
+an administrator can try changing the default timeout value
+by uncommenting or adding the following setting in `/etc/gitlab/gitlab.rb`:
 
 ```ruby
 gitlab_rails['webhook_timeout'] = 10
diff --git a/doc/user/project/pages/redirects.md b/doc/user/project/pages/redirects.md
index beafbc86cb5..cdae1d2f837 100644
--- a/doc/user/project/pages/redirects.md
+++ b/doc/user/project/pages/redirects.md
@@ -163,6 +163,12 @@ Splats also match empty strings, so the previous rule redirects
 
 ### Rewrite all requests to a root `index.html`
 
+NOTE:
+If you are using [GitLab Pages integration with Let’s Encrypt](custom_domains_ssl_tls_certification/lets_encrypt_integration.md),
+you must enable it before adding this rule. Otherwise, the redirection breaks the Let's Encrypt
+integration. For more details, see
+[GitLab Pages issue 649](https://gitlab.com/gitlab-org/gitlab-pages/-/issues/649).
+
 Single page applications (SPAs) often perform their own routing using
 client-side routes. For these applications, it's important that _all_ requests
 are rewritten to the root `index.html` so that the routing logic can be handled
@@ -180,7 +186,7 @@ rule like:
 Use placeholders in rules to match portions of the requested URL and use these
 matches when rewriting or redirecting to a new URL.
 
-A placehold is formatted as a `:` character followed by a string of letters
+A placeholder is formatted as a `:` character followed by a string of letters
 (`[a-zA-Z]+`) in both the `from` and `to` paths:
 
 ```plaintext