diff --git a/Changelog.md b/Changelog.md index 0bd92472..981b0dd9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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 diff --git a/README.md b/README.md index a93291ea..088ba26c 100644 --- a/README.md +++ b/README.md @@ -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` | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 2f632bc5..22f41cbc 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -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 diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 4b05ca2c..a039b1b1 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -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} diff --git a/assets/runtime/functions b/assets/runtime/functions index 732c68fd..e92f2619 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -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