Remove GITLAB_MAX_OBJECT_SIZE

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

View File

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

View File

@ -838,7 +838,6 @@ Below is the complete list of available options that can be used to customize yo
| `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_MAX_OBJECT_SIZE` | Maximum size (in bytes) of a git object (eg. a commit) in bytes. Defaults to `20971520`, i.e. `20` megabytes. |
| `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,10 +548,6 @@ production: &base
# Use the default values unless you really know what you are doing
git:
bin_path: /usr/bin/git
# The next value is the maximum memory size grit can use
# Given in number of bytes per git object (e.g. a commit)
# This value can be increased if you have very large commits
max_size: {{GITLAB_MAX_OBJECT_SIZE}} # 20.megabytes
# Git timeout to read a commit, in seconds
timeout: {{GITLAB_TIMEOUT}}

View File

@ -84,19 +84,6 @@ fi
GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10}
GITLAB_TIMEOUT=${GITLAB_TIMEOUT:-10}
GITLAB_MAX_OBJECT_SIZE=${GITLAB_MAX_OBJECT_SIZE:-}
if [[ -z ${GITLAB_MAX_OBJECT_SIZE} ]]; then
if [[ -n ${NGINX_MAX_UPLOAD_SIZE} ]]; then # backward compatibility
GITLAB_MAX_OBJECT_SIZE=$(echo $NGINX_MAX_UPLOAD_SIZE |sed -e "s/^ *\([0-9]*\)[mMkKgG] *$/\1/g")
case ${NGINX_MAX_UPLOAD_SIZE} in
*[kK] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1024));;
*[mM] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1048576));;
*[gG] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1073741824));;
esac
else
GITLAB_MAX_OBJECT_SIZE=${GITLAB_MAX_OBJECT_SIZE:-20971520}
fi
fi
GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}

View File

@ -1427,7 +1427,6 @@ configure_gitlab() {
GITLAB_PORT \
GITLAB_RELATIVE_URL_ROOT \
GITLAB_HTTPS \
GITLAB_MAX_OBJECT_SIZE \
GITLAB_SSH_HOST \
GITLAB_SSH_PORT \
GITLAB_SIGNUP_ENABLED \