diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-15 10:07:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-15 10:07:29 +0000 |
| commit | a8d1cbbecc2f09626ba77556786cbea9b78eb5a9 (patch) | |
| tree | d547f68338b7241fb9c844b6a67b912853eb1587 | |
| parent | 27cf081e1b0b1df1661aaf0ae6b60b05ef3eb8d8 (diff) | |
| parent | ec381a93089605afc33b387a09de3a828c63d535 (diff) | |
| download | gitlab-ce-a8d1cbbecc2f09626ba77556786cbea9b78eb5a9.tar.gz | |
Merge branch 'git_max_size' into 'master'
Use new git max_size in the settings initializer
This allows us to avoid repeating default max_size setting in the omnibus-gitlab repository.
See merge request !1021
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 49e35d5bb68..136622c65a2 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -133,7 +133,7 @@ Settings.backup['path'] = File.expand_path(Settings.backup['path'] || "t # Git # Settings['git'] ||= Settingslogic.new({}) -Settings.git['max_size'] ||= 5242880 # 5.megabytes +Settings.git['max_size'] ||= 20971520 # 20.megabytes Settings.git['bin_path'] ||= '/usr/bin/git' Settings.git['timeout'] ||= 10 |