diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-01 18:15:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-01 18:15:19 +0000 |
| commit | 5fc2d78fb96b0fd50dfb737190fd411033b3c3ab (patch) | |
| tree | 24cb469e61661c923a1398505b2bb928612f80d4 /doc/administration/environment_variables.md | |
| parent | 66629d156e2420269ed53eff3dca0912cfe848e2 (diff) | |
| download | gitlab-ce-5fc2d78fb96b0fd50dfb737190fd411033b3c3ab.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/environment_variables.md')
| -rw-r--r-- | doc/administration/environment_variables.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index 21e32d145bd..22159b6e9db 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -31,6 +31,7 @@ You can use the following environment variables to override certain values: | `GITLAB_EMAIL_REPLY_TO` | string | The email address used in the **Reply-To** field in emails sent by GitLab. | | `GITLAB_EMAIL_SUBJECT_SUFFIX` | string | The email subject suffix used in emails sent by GitLab. | | `GITLAB_HOST` | string | The full URL of the GitLab server (including `http://` or `https://`). | +| `GITLAB_MARKUP_TIMEOUT` | string | Timeout, in seconds, for `rest2html` and `pod2html` commands executed by the [`gitlab-markup` gem](https://gitlab.com/gitlab-org/gitlab-markup/). Default is `10`. | | `GITLAB_ROOT_PASSWORD` | string | Sets the password for the `root` user on installation. | | `GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN` | string | Sets the initial registration token used for runners. | | `RAILS_ENV` | string | The Rails environment; can be one of `production`, `development`, `staging`, or `test`. | |