Add latest changes from gitlab-org/gitlab@master

6 files changed, 71 insertions, 3 deletions

diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index 525348464db..d652a5d66e0 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -50,6 +50,7 @@ From there, you can see the following actions:
 - User sign-in via [Group SAML](../user/group/saml_sso/index.md)
 - Permissions changes of a user assigned to a group
 - Removed user from group
+- Project imported in to group
 - Project added to group and with which visibility level
 - Project removed from group
 - [Project shared with group](../user/project/members/share_project_with_groups.md)
diff --git a/doc/administration/external_database.md b/doc/administration/external_database.md
index 4a1059a18d0..13c9ef872f8 100644
--- a/doc/administration/external_database.md
+++ b/doc/administration/external_database.md
@@ -13,5 +13,24 @@ If you use a cloud-managed service, or provide your own PostgreSQL instance:
    [database requirements document](../install/requirements.md#database).
 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user
    needs privileges to create the `gitlabhq_production` database.
-1. Configure the GitLab application servers with the appropriate details.
-   This step is covered in [Configuring GitLab for HA](high_availability/gitlab.md).
+1. Configure the GitLab application servers with the appropriate connection details
+   for your external PostgreSQL service in your `/etc/gitlab/gitlab.rb` file:
+
+    ```ruby
+    # Disable the bundled Omnibus provided PostgreSQL
+    postgresql['enable'] = false
+
+    # PostgreSQL connection details
+    gitlab_rails['db_adapter'] = 'postgresql'
+    gitlab_rails['db_encoding'] = 'unicode'
+    gitlab_rails['db_host'] = '10.1.0.5' # IP/hostname of database server
+    gitlab_rails['db_password'] = 'DB password'
+    ```
+
+    For more information on GitLab HA setups, refer to [configuring GitLab for HA](high_availability/gitlab.md).
+
+1. Reconfigure for the changes to take effect:
+
+   ```shell
+   sudo gitlab-ctl reconfigure
+   ```
diff --git a/doc/api/README.md b/doc/api/README.md
index 6b9ca5703fe..34d496a37fe 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -75,7 +75,7 @@ end of an API URL.
 Most API requests require authentication, or will only return public data when
 authentication is not provided. For
 those cases where it is not required, this will be mentioned in the documentation
-for each individual endpoint. For example, the [`/projects/:id` endpoint](projects.md).
+for each individual endpoint. For example, the [`/projects/:id` endpoint](projects.md#get-single-project).
 
 There are several ways to authenticate with the GitLab API:
 
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index cc21b169120..81b27a17aec 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -6883,6 +6883,11 @@ type Project {
     Sort alerts by this criteria
     """
     sort: AlertManagementAlertSort
+
+    """
+    Alerts with the specified statues. For example, [TRIGGERED]
+    """
+    statuses: [AlertManagementStatus!]
   ): AlertManagementAlert
 
   """
@@ -6918,6 +6923,11 @@ type Project {
     Sort alerts by this criteria
     """
     sort: AlertManagementAlertSort
+
+    """
+    Alerts with the specified statues. For example, [TRIGGERED]
+    """
+    statuses: [AlertManagementStatus!]
   ): AlertManagementAlertConnection
 
   """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index c7614b8dd6b..344edccb711 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -20591,6 +20591,24 @@
                   "defaultValue": null
                 },
                 {
+                  "name": "statuses",
+                  "description": "Alerts with the specified statues. For example, [TRIGGERED]",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "ENUM",
+                        "name": "AlertManagementStatus",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
                   "name": "sort",
                   "description": "Sort alerts by this criteria",
                   "type": {
@@ -20624,6 +20642,24 @@
                   "defaultValue": null
                 },
                 {
+                  "name": "statuses",
+                  "description": "Alerts with the specified statues. For example, [TRIGGERED]",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "ENUM",
+                        "name": "AlertManagementStatus",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
                   "name": "sort",
                   "description": "Sort alerts by this criteria",
                   "type": {
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 05906520c1c..4307bfb4a74 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -297,6 +297,8 @@ We need a security group for our database that will allow inbound traffic from t
 
 ### Create the database
 
+DANGER: **Danger:** Avoid using burstable instances (t class instances) for the database as this could lead to performance issues due to CPU credits running out during sustained periods of high load.
+
 Now, it's time to create the database:
 
 1. Navigate to the RDS dashboard, select **Databases** from the left menu, and click **Create database**.