Add latest changes from gitlab-org/gitlab@master

4 files changed, 31 insertions, 5 deletions

diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index 14e54513536..ec90ceede31 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -417,8 +417,27 @@ To configure the `s3` storage driver in Omnibus:
    }
    ```
 
-   - `regionendpoint` is only required when configuring an S3 compatible service such as MinIO. It takes a URL such as `http://127.0.0.1:9000`.
+   If using with an [AWS S3 VPC endpoint](https://docs.aws.amazon.com/vpc/latest/privatelink/vpc-endpoints-s3.html),
+   then set `regionendpoint` to your VPC endpoint address and set `path_style` to false:
+
+   ```ruby
+   registry['storage'] = {
+     's3' => {
+       'accesskey' => 's3-access-key',
+       'secretkey' => 's3-secret-key-for-access-key',
+       'bucket' => 'your-s3-bucket',
+       'region' => 'your-s3-region',
+       'regionendpoint' => 'your-s3-vpc-endpoint',
+       'path_style' => false
+     }
+   }
+   ```
+
+   - `regionendpoint` is only required when configuring an S3 compatible service such as MinIO, or
+     when using an AWS S3 VPC Endpoint.
    - `your-s3-bucket` should be the name of a bucket that exists, and can't include subdirectories.
+   - `path_style` should be set to true to use `host/bucket_name/object` style paths instead of
+     `bucket_name.host/object`. [Set to false for AWS S3](https://aws.amazon.com/blogs/aws/amazon-s3-path-deprecation-plan-the-rest-of-the-story/).
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
diff --git a/doc/user/project/issues/img/issue_type_change_v13_12.png b/doc/user/project/issues/img/issue_type_change_v13_12.png
new file mode 100644
index 00000000000..3b4864ffbbb
--- /dev/null
+++ b/doc/user/project/issues/img/issue_type_change_v13_12.png
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index 9e8a75743a7..09c7762d3eb 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -326,6 +326,17 @@ In order to change the default issue closing pattern, GitLab administrators must
 [`gitlab.rb` or `gitlab.yml` file](../../../administration/issue_closing_pattern.md)
 of your installation.
 
+## Change the issue type
+
+Users with [developer permission](../../permissions.md)
+can change an issue's type. To do this, edit the issue and select an issue type from the
+**Issue type** selector menu:
+
+- [Issue](index.md)
+- [Incident](../../../operations/incident_management/index.md)
+
+![Change the issue type](img/issue_type_change_v13_12.png)
+
 ## Deleting issues
 
 Users with [project owner permission](../../permissions.md) can delete an issue by
diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md
index 16ff8538630..d00d60b8e8e 100644
--- a/doc/user/reserved_names.md
+++ b/doc/user/reserved_names.md
@@ -54,13 +54,11 @@ Currently the following names are reserved as top level groups:
 - `500.html`
 - `502.html`
 - `503.html`
-- `abuse_reports`
 - `admin`
 - `api`
 - `apple-touch-icon-precomposed.png`
 - `apple-touch-icon.png`
 - `assets`
-- `autocomplete`
 - `dashboard`
 - `deploy.html`
 - `explore`
@@ -71,7 +69,6 @@ Currently the following names are reserved as top level groups:
 - `health_check`
 - `help`
 - `import`
-- `invites`
 - `jwt`
 - `login`
 - `oauth`
@@ -81,7 +78,6 @@ Currently the following names are reserved as top level groups:
 - `robots.txt`
 - `s`
 - `search`
-- `sent_notifications`
 - `sitemap`
 - `sitemap.xml`
 - `sitemap.xml.gz`