diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 09:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 09:07:54 +0000 |
commit | 87ef501eacd66d7166183d20d84e33de022f7002 (patch) | |
tree | fa4e0f41e00a4b6aeb035530be4b5473f51b7a3d /doc/administration | |
parent | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (diff) | |
download | gitlab-ce-87ef501eacd66d7166183d20d84e33de022f7002.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/geo/replication/datatypes.md | 2 | ||||
-rw-r--r-- | doc/administration/instance_limits.md | 8 | ||||
-rw-r--r-- | doc/administration/libravatar.md | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md index e7c1b2793c7..9ee215c60c5 100644 --- a/doc/administration/geo/replication/datatypes.md +++ b/doc/administration/geo/replication/datatypes.md @@ -75,7 +75,7 @@ GitLab stores files and blobs such as Issue attachments or LFS objects into eith - The filesystem in a specific location. - An Object Storage solution. Object Storage solutions can be: - Cloud based like Amazon S3 Google Cloud Storage. - - Self hosted (like MinIO). + - Hosted by you (like MinIO). - A Storage Appliance that exposes an Object Storage-compatible API. When using the filesystem store instead of Object Storage, you need to use network mounted filesystems diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index 9c64453dadd..7beb1193459 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -72,10 +72,10 @@ If a new pipeline would cause the total number of jobs to exceed the limit, the will fail with a `job_activity_limit_exceeded` error. - On GitLab.com different [limits are defined per plan](../user/gitlab_com/index.md#gitlab-cicd) and they affect all projects under that plan. -- On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-hosted installations, this limit is defined for the `default` plan that affects all projects. +- On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-managed installations, this limit is defined for the `default` plan that affects all projects. This limit is disabled by default. -To set this limit on a self-hosted installation, run the following in the +To set this limit on a self-managed installation, run the following in the [GitLab Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session): ```ruby @@ -113,9 +113,9 @@ text field exceeds this limit then the text will be truncated to this number of characters and the rest will not be indexed and hence will not be searchable. - On GitLab.com this is limited to 20000 characters -- For self-hosted installations it is unlimited by default +- For self-managed installations it is unlimited by default -This limit can be configured for self hosted installations when [enabling +This limit can be configured for self-managed installations when [enabling Elasticsearch](../integration/elasticsearch.md#enabling-elasticsearch). NOTE: **Note:** Set the limit to `0` to disable it. diff --git a/doc/administration/libravatar.md b/doc/administration/libravatar.md index 43a6b8f0d34..c28e701dc25 100644 --- a/doc/administration/libravatar.md +++ b/doc/administration/libravatar.md @@ -9,7 +9,7 @@ GitLab by default supports the [Gravatar](https://gravatar.com) avatar service. Libravatar is another service that delivers your avatar (profile picture) to other websites. The Libravatar API is [heavily based on gravatar](https://wiki.libravatar.org/api/), so you can -easily switch to the Libravatar avatar service or even a self-hosted Libravatar +easily switch to the Libravatar avatar service or even your own Libravatar server. ## Configuration @@ -35,7 +35,7 @@ the configuration options as follows: ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon" ``` -### Self-hosted Libravatar server +### Your own Libravatar server If you are [running your own libravatar service](https://wiki.libravatar.org/running_your_own/), the URL will be different in the configuration, but you must provide the same |