Merge branch 'git-repack-bitmaps' into 'master'
Enable Git packfile bitmap creation Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/510 CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6104 See merge request !975
This commit is contained in:
commit
2a07f08ff4
|
@ -22,7 +22,8 @@
|
|||
default['gitlab']['bootstrap']['enable'] = true
|
||||
default['gitlab']['omnibus-gitconfig']['system'] = {
|
||||
"pack" => ["threads = 1"],
|
||||
"receive" => ["fsckObjects = true"]
|
||||
"receive" => ["fsckObjects = true"],
|
||||
"repack" => ["writeBitmaps = true"],
|
||||
}
|
||||
# Create users and groups needed for the package
|
||||
default['gitlab']['manage-accounts']['enable'] = true
|
||||
|
|
|
@ -33,9 +33,15 @@ describe 'gitlab::default' do
|
|||
mode: '0755'
|
||||
)
|
||||
|
||||
gitconfig_hash = {
|
||||
"receive" => ["fsckObjects = true"],
|
||||
"pack" => ["threads = 2"],
|
||||
"repack" => ["writeBitmaps = true"],
|
||||
}
|
||||
|
||||
expect(chef_run).to create_template('/opt/gitlab/embedded/etc/gitconfig').with(
|
||||
source: 'gitconfig-system.erb',
|
||||
variables: { gitconfig: { "receive" => ["fsckObjects = true"], "pack" => ["threads = 2"] } },
|
||||
variables: { gitconfig: gitconfig_hash },
|
||||
mode: 0755
|
||||
)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue