diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-17 12:56:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-17 12:56:05 +0000 |
| commit | 576ed6057690269538a76b8d788eb0d77e1fda9c (patch) | |
| tree | 7545c581dbadfc3dadb0ac7e71dcd9e6301f1f7b | |
| parent | a5f0656392699dad7677a368c315217ea99b3982 (diff) | |
| parent | 6d7f991a5e18ec04d6d7f65521dfa5e51b6887f6 (diff) | |
| download | gitlab-ce-576ed6057690269538a76b8d788eb0d77e1fda9c.tar.gz | |
Merge branch '32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html' into 'master'
Removes duplicate environment variable in documentation
Closes #32395
See merge request !11438
| -rw-r--r-- | changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml | 4 | ||||
| -rw-r--r-- | doc/administration/environment_variables.md | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml b/changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml new file mode 100644 index 00000000000..d2be3d6cc4b --- /dev/null +++ b/changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml @@ -0,0 +1,4 @@ +--- +title: Removes duplicate environment variable in documentation +merge_request: +author: diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index 76029b30dd8..b6676026d06 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -20,7 +20,6 @@ Variable | Type | Description `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 |