Add latest changes from gitlab-org/gitlab@master

5 files changed, 60 insertions, 0 deletions

diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index 6d620722608..0f978a8f3a9 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -738,6 +738,11 @@ NOTE: **Note:**
 The most _specific_ spec takes precedence over the other wildcard matching.
 In this case, `review/feature-1` spec takes precedence over `review/*` and `*` specs.
 
+### Environments Dashboard **(PREMIUM)**
+
+See [Environments Dashboard](environments/environments_dashboard.md) for a summary of each
+environment's operational health.
+
 ## Limitations
 
 In the `environment: name`, you are limited to only the [predefined environment variables](variables/predefined_variables.md).
diff --git a/doc/ci/environments/environments_dashboard.md b/doc/ci/environments/environments_dashboard.md
new file mode 100644
index 00000000000..f82728cd587
--- /dev/null
+++ b/doc/ci/environments/environments_dashboard.md
@@ -0,0 +1,51 @@
+---
+type: reference
+---
+
+# Environments Dashboard **(PREMIUM)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/3713) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.5.
+
+The Environments Dashboard provides a cross-project
+environment-based view that lets you see the big picture
+of what is going on in each environment. From a single
+location, you can track the progress as changes flow
+from development to staging, and then to production (or
+through any series of custom environment flows you can set up).
+With an at-a-glance view of multiple projects, you can instantly
+see which pipelines are green and which are red allowing you to
+diagnose if there is a block at a particular point, or if there’s
+a more systemic problem you need to investigate.
+
+You can access the dashboard from the top bar by clicking
+**More > Environments**.
+
+![Environments Dashboard with projects](img/environments_dashboard_v12_5.png)
+
+The Environments Dashboard displays a maximum of 7 projects
+and 3 environments per project.
+
+The listed environments for each project are unique, such as
+"production", "staging", etc. Review apps and other grouped
+environments are not displayed.
+
+## Adding a project to the dashboard
+
+To add a project to the dashboard:
+
+1. Click the **Add projects** button in the homescreen of the dashboard.
+1. Search and add one or more projects using the **Search your projects** field.
+1. Click the **Add projects** button.
+
+Once added, you can see a summary of each project's environment operational
+health, including the latest commit, pipeline status, and deployment time.
+
+The Environments and [Operations](../../user/operations_dashboard/index.md)
+dashboards share the same list of projects. When you add or remove a
+project from one, GitLab adds or removes the project from the other.
+
+## Environment dashboards on GitLab.com
+
+GitLab.com users can add public projects to the Environments
+Dashboard for free. If your project is private, the group it belongs
+to must have a [GitLab Silver](https://about.gitlab.com/pricing/) plan.
diff --git a/doc/ci/environments/img/environments_dashboard_v12_5.png b/doc/ci/environments/img/environments_dashboard_v12_5.png
new file mode 100644
index 00000000000..e83c4fac75b
--- /dev/null
+++ b/doc/ci/environments/img/environments_dashboard_v12_5.png
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index ecd6516bd2e..106c7714bfe 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -128,6 +128,8 @@ CREATE EXTENSION pg_trgm;
 On some systems you may need to install an additional package (e.g.
 `postgresql-contrib`) for this extension to become available.
 
+NOTE: **Note:** Support for PostgreSQL 9.6 and 10 will be removed in GitLab 13.0 so that GitLab can benefit from PostgreSQL 11 improvements, such as partitioning. For the schedule on adding support for PostgreSQL 11 and 12, see [the related epic](https://gitlab.com/groups/gitlab-org/-/epics/2184). For the release schedule for GitLab 13.0, see [GitLab's release and maintenance policy](../policy/maintenance.md).
+
 #### Additional requirements for GitLab Geo
 
 If you are using [GitLab Geo](../development/geo.md):
diff --git a/doc/user/operations_dashboard/index.md b/doc/user/operations_dashboard/index.md
index cdb80cca6f7..531422ca077 100644
--- a/doc/user/operations_dashboard/index.md
+++ b/doc/user/operations_dashboard/index.md
@@ -23,6 +23,8 @@ To add a project to the dashboard:
 Once added, the dashboard will display the project's number of active alerts,
 last commit, pipeline status, and when it was last deployed.
 
+The Operations and [Environments](../../ci/environments/environments_dashboard.md) dashboards share the same list of projects. Adding or removing a project from one adds or removes the project from the other.
+
 ![Operations Dashboard with projects](img/index_operations_dashboard_with_projects.png)
 
 ## Arranging projects on a dashboard