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

Merge branch 'git_max_size' into 'master'
a8d1cbbe · Dmitriy Zaporozhets · 27cf081e · ec381a93 · a8d1cbbe
Commit a8d1cbbe authored Aug 15, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

1_settings.rb config/initializers/1_settings.rb +1 -1

No files found.
--- 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