summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-09-26 16:24:54 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-09-26 16:24:54 -0500
commit6f9a6d37a9237d19447c7936c53df02d841f5c66 (patch)
treed3a88f0781e757eb15d00ea8f2a72377ad726176 /config/gitlab.yml.example
parent59d631371ce22e702791504a544c1be61fceb676 (diff)
parent05d8e87dba4abaf9eb495bac147c4d4c5426da2e (diff)
downloadgitlab-ce-6f9a6d37a9237d19447c7936c53df02d841f5c66.tar.gz
Merge branch 'master' into ff_port_from_ee
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example6
1 files changed, 0 insertions, 6 deletions
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