diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-03 14:27:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-03 14:27:08 +0000 |
| commit | d5773103e6ff7438faa2a4084286ffafc75fd3a5 (patch) | |
| tree | b02fc7d4a923d551fef4d1dbdf0bb3eef14b5ff8 /doc | |
| parent | 8d333c87f19ae2f13e4494458b48fe97773da48d (diff) | |
| parent | bb94408537dd8bd0fdb7bc1577c55bde1ee2fc41 (diff) | |
| download | gitlab-ce-d5773103e6ff7438faa2a4084286ffafc75fd3a5.tar.gz | |
Merge branch 'add-email-subject-suffix' into 'master'
Add configurable email subject suffix
## Why was this MR needed?
I noticed that there is a commit 44ab156e 3 years ago which removes email subject prefix
actually we do need an special part of the email subject which makes the email subject easy to identify
we just need to make it configurable rather than remove it.
See merge request !6172
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/environment_variables.md | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index 7f53915a4d7..b4a953d1ccc 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -13,15 +13,17 @@ override certain values. Variable | Type | Description -------- | ---- | ----------- -`GITLAB_ROOT_PASSWORD` | string | Sets the password for the `root` user on installation -`GITLAB_HOST` | string | The full URL of the GitLab server (including `http://` or `https://`) -`RAILS_ENV` | string | The Rails environment; can be one of `production`, `development`, `staging` or `test` -`DATABASE_URL` | string | The database URL; is of the form: `postgresql://localhost/blog_development` -`GITLAB_EMAIL_FROM` | string | The e-mail address used in the "From" field in e-mails sent by GitLab -`GITLAB_EMAIL_DISPLAY_NAME` | string | The name used in the "From" field in e-mails sent by GitLab -`GITLAB_EMAIL_REPLY_TO` | string | The e-mail address used in the "Reply-To" field in e-mails sent by GitLab -`GITLAB_UNICORN_MEMORY_MIN` | integer | The minimum memory threshold (in bytes) for the Unicorn worker killer -`GITLAB_UNICORN_MEMORY_MAX` | integer | The maximum memory threshold (in bytes) for the Unicorn worker killer +`GITLAB_ROOT_PASSWORD` | string | Sets the password for the `root` user on installation +`GITLAB_HOST` | string | The full URL of the GitLab server (including `http://` or `https://`) +`RAILS_ENV` | string | The Rails environment; can be one of `production`, `development`, `staging` or `test` +`DATABASE_URL` | string | The database URL; is of the form: `postgresql://localhost/blog_development` +`GITLAB_EMAIL_FROM` | string | The e-mail address used in the "From" field in e-mails sent by GitLab +`GITLAB_EMAIL_DISPLAY_NAME` | string | The name used in the "From" field in e-mails sent by GitLab +`GITLAB_EMAIL_REPLY_TO` | string | The e-mail address used in the "Reply-To" field in e-mails sent by GitLab +`GITLAB_EMAIL_REPLY_TO` | string | The e-mail address used in the "Reply-To" field in e-mails sent by GitLab +`GITLAB_EMAIL_SUBJECT_SUFFIX` | string | The e-mail subject suffix used in e-mails sent by GitLab +`GITLAB_UNICORN_MEMORY_MIN` | integer | The minimum memory threshold (in bytes) for the Unicorn worker killer +`GITLAB_UNICORN_MEMORY_MAX` | integer | The maximum memory threshold (in bytes) for the Unicorn worker killer ## Complete database variables |