diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-13 06:01:37 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-13 06:01:37 +0000 |
| commit | 6a9c2461d9ce2c0628cd6846a8c0600e6c4e1517 (patch) | |
| tree | 57a51add3752571fb698ea2639d5597d4aed0aee /doc/user | |
| parent | 39ed43c4325c70b58a9b3c3a9a817c6a29dfad34 (diff) | |
| parent | d2a7a4addc79192fc074584fa2a682b3e9f5aa05 (diff) | |
| download | gitlab-ce-6a9c2461d9ce2c0628cd6846a8c0600e6c4e1517.tar.gz | |
Merge branch 'docs/update-gitlab-com-default-for-sidekiq-schedule-cron' into 'master'
Update default values in GitLab.com settings
See merge request gitlab-org/gitlab-ce!31682
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/gitlab_com/index.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 928950126da..971fd3f28c4 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -223,7 +223,7 @@ and the following environment variables: | Setting | GitLab.com | Default | |-------- |----------- |-------- | -| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `1000000` | `1000000` | +| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `1000000` | `2000000` | | `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL` | `SIGKILL` | - | | `SIDEKIQ_LOG_ARGUMENTS` | `1` | - | |