summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Voogsgerd <daniel@voogsgerd.nl>2016-11-05 14:47:38 +0100
committerStan Hu <stanhu@gmail.com>2017-09-21 22:04:49 -0400
commitf4c45417fe4108a563e3900ff813ff53af7afcb0 (patch)
tree40b7b9727ab83decf8c73c2e9a6da04eb345ff1c
parentbc33774f5227c2a8ca7dbc04c5a6a88bd5abdbc9 (diff)
downloadgitlab-ce-voogsgerd/gitlab-ce-daniel-legacy-config.tar.gz
Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-config
Removed the max_size and timeout options from the git config in gitlab.yml.
-rw-r--r--changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml5
-rw-r--r--config/gitlab.yml.example6
2 files changed, 5 insertions, 6 deletions
diff --git a/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml b/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml
new file mode 100644
index 00000000000..faa5d3303c6
--- /dev/null
+++ b/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml
@@ -0,0 +1,5 @@
+---
+title: Removed two legacy config options
+merge_request:
+author: Daniel Voogsgerd
+type: deprecated
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index cd44f888d3f..9b496822e93 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -577,12 +577,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: 20971520 # 20.megabytes
- # Git timeout to read a commit, in seconds
- timeout: 10
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running