Commit 70891b3b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master'

Removed two legacy config options

See merge request gitlab-org/gitlab-ce!14425
parents d2d5549d f4c45417
---
title: Removed two legacy config options
merge_request:
author: Daniel Voogsgerd
type: deprecated
...@@ -577,12 +577,6 @@ production: &base ...@@ -577,12 +577,6 @@ production: &base
# Use the default values unless you really know what you are doing # Use the default values unless you really know what you are doing
git: git:
bin_path: /usr/bin/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 ## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment