diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-22 06:13:59 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-22 06:13:59 +0000 |
| commit | 70891b3b0e817206fce9fd710dcce93758d097bb (patch) | |
| tree | 1c8a97d350cc28bb66523c23c718d27416d2a585 | |
| parent | d2d5549d2a3b9e3a8a367b9415d3ed9ca38b9f67 (diff) | |
| parent | f4c45417fe4108a563e3900ff813ff53af7afcb0 (diff) | |
| download | gitlab-ce-70891b3b0e817206fce9fd710dcce93758d097bb.tar.gz | |
Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master'
Removed two legacy config options
See merge request gitlab-org/gitlab-ce!14425
| -rw-r--r-- | changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml | 5 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 6 |
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 |