Remove GITLAB_TIMEOUT

Signed-off-by: solidnerd <niclas@mietz.io>
This commit is contained in:
solidnerd 2017-12-26 11:12:01 +01:00
parent c04ee489d9
commit 1f02a1b54c
No known key found for this signature in database
GPG Key ID: C300D44AB5469BE5
5 changed files with 2 additions and 6 deletions

View File

@ -10,6 +10,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
- REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME`
- REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT`
- REMOVED `GITLAB_MAX_OBJECT_SIZE`
- REMOVED `GITLAB_TIMEOUT`
**10.2.5**
- gitlab: upgrade CE to v10.2.5

View File

@ -837,7 +837,6 @@ Below is the complete list of available options that can be used to customize yo
| `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. |
| `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. |
| `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. |
| `GITLAB_TIMEOUT` | Sets the timeout for git commands. Defaults to `10` seconds. |
| `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` |
| `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |
| `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` |

View File

@ -548,8 +548,6 @@ production: &base
# Use the default values unless you really know what you are doing
git:
bin_path: /usr/bin/git
# Git timeout to read a commit, in seconds
timeout: {{GITLAB_TIMEOUT}}
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running

View File

@ -83,7 +83,6 @@ if [[ -z ${GITLAB_RELATIVE_URL_ROOT} || ${GITLAB_RELATIVE_URL_ROOT} == / ]]; the
fi
GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10}
GITLAB_TIMEOUT=${GITLAB_TIMEOUT:-10}
GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}

View File

@ -1432,8 +1432,7 @@ configure_gitlab() {
GITLAB_SIGNUP_ENABLED \
GITLAB_PROJECTS_LIMIT \
GITLAB_USERNAME_CHANGE \
GITLAB_CREATE_GROUP \
GITLAB_TIMEOUT
GITLAB_CREATE_GROUP
gitlab_configure_database
gitlab_configure_redis