diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 12:07:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 12:07:16 +0300 |
commit | 2b67531b0fd7c94cb1d8618166c4193f40ea5a1f (patch) | |
tree | e6cefd08d250a04fde66e03de7c59f1e535463fd /doc | |
parent | ed58c351374814027fbb2383ddecb9fa38de0c57 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/high_availability/nfs.md | 3 | ||||
-rw-r--r-- | doc/topics/autodevops/img/disable_postgres.png | bin | 0 -> 10007 bytes | |||
-rw-r--r-- | doc/topics/autodevops/index.md | 29 | ||||
-rw-r--r-- | doc/user/clusters/applications.md | 3 | ||||
-rw-r--r-- | doc/user/permissions.md | 1 | ||||
-rw-r--r-- | doc/user/project/quick_actions.md | 4 |
6 files changed, 35 insertions, 5 deletions
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md index c4b82ee073a..60e7cfd6be9 100644 --- a/doc/administration/high_availability/nfs.md +++ b/doc/administration/high_availability/nfs.md @@ -103,8 +103,7 @@ If you do choose to use EFS, avoid storing GitLab log files (e.g. those in `/var there because this will also affect performance. We recommend that the log files be stored on a local volume. -For more details on another person's experience with EFS, see -[Amazon's Elastic File System: Burst Credits](https://rawkode.com/2017/04/16/amazons-elastic-file-system-burst-credits/) +For more details on another person's experience with EFS, see this [Commit Brooklyn 2019 video](https://youtu.be/K6OS8WodRBQ?t=313). ## Avoid using CephFS and GlusterFS diff --git a/doc/topics/autodevops/img/disable_postgres.png b/doc/topics/autodevops/img/disable_postgres.png Binary files differnew file mode 100644 index 00000000000..f8fe508915c --- /dev/null +++ b/doc/topics/autodevops/img/disable_postgres.png diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 4d4d2dce765..e70be6401ec 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -847,6 +847,35 @@ the database are preconfigured, but can be customized by setting the associated postgres://user:password@postgres-host:postgres-port/postgres-database ``` +#### Using external PostgreSQL database providers + +While Auto DevOps provides out-of-the-box support for a PostgreSQL container for +production environments, for some use-cases it may not be sufficiently secure or +resilient and you may wish to use an external managed provider for PostgreSQL. +For example, AWS Relational Database Service. + +You will need to define environment-scoped variables for `POSTGRES_ENABLED` and `DATABASE_URL` in your project's CI/CD settings. + +To achieve this: + +1. Disable the built-in PostgreSQL installation for the required environments using + scoped [environment variables](../../ci/environments.md#scoping-environments-with-specs). + For this use case, it's likely that only `production` will need to be added to this + list as the builtin PostgreSQL setup for Review Apps and staging will be sufficient + as a high availability setup is not required. + + ![Auto Metrics](img/disable_postgres.png) + +1. Define the `DATABASE_URL` CI variable as a scoped environment variable that will be + available to your application. This should be a URL in the following format: + + ```yaml + postgres://user:password@postgres-host:postgres-port/postgres-database + ``` + +You will need to ensure that your Kubernetes cluster has network access to wherever +PostgreSQL is hosted. + ### Environment variables The following variables can be used for setting up the Auto DevOps domain, diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index c2546c63ee9..c525bf04d99 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -158,7 +158,7 @@ application for the changes to take effect. ### JupyterHub > - Introduced in GitLab 11.0 for project-level clusters. -> - Introduced in GitLab 12.3 for group-level clusters. +> - Introduced in GitLab 12.3 for group and instance-level clusters. [JupyterHub](https://jupyterhub.readthedocs.io/en/stable/) is a multi-user service for managing notebooks across a team. [Jupyter @@ -191,6 +191,7 @@ file. #### Jupyter Git Integration > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/28783) in GitLab 12.0 for project-level clusters. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/32512) in GitLab 12.3 for group and instance-level clusters. When installing JupyterHub onto your Kubernetes cluster, [JupyterLab's Git extension](https://github.com/jupyterlab/jupyterlab-git) is automatically provisioned and configured using the authenticated user's: diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 70191100e9e..a46181bb74a 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -125,6 +125,7 @@ The following table depicts the various user permission levels in a project. | Manage Error Tracking | | | | ✓ | ✓ | | Delete wiki pages | | | | ✓ | ✓ | | View project Audit Events | | | | ✓ | ✓ | +| Manage [push rules](../push_rules/push_rules.md) | | | | ✓ | ✓ | | Switch visibility level | | | | | ✓ | | Transfer project to another namespace | | | | | ✓ | | Remove project | | | | | ✓ | diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md index d54ee6dcb07..61bc66a6a69 100644 --- a/doc/user/project/quick_actions.md +++ b/doc/user/project/quick_actions.md @@ -64,8 +64,8 @@ The following quick actions are applicable to descriptions, discussions and thre | `/create_merge_request <branch name>` | ✓ | | | Create a new merge request starting from the current issue | | `/relate #issue1 #issue2` | ✓ | | | Mark issues as related **(STARTER)** | | `/move <path/to/project>` | ✓ | | | Move this issue to another project | -| `/zoom <Zoom URL>` | ✓ | | | Add Zoom meeting to this issue. | -| `/remove_zoom` | ✓ | | | Remove Zoom meeting from this issue. | +| `/zoom <Zoom URL>` | ✓ | | | Add Zoom meeting to this issue. ([Introduced in GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609)) | +| `/remove_zoom` | ✓ | | | Remove Zoom meeting from this issue. ([Introduced in GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609)) | | `/target_branch <local branch name>` | | ✓ | | Set target branch | | `/wip` | | ✓ | | Toggle the Work In Progress status | | `/approve` | | ✓ | | Approve the merge request | |