gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'romain.maffina/omnibus-gitlab-set-advertise-push-options-by-default'

This commit is contained in:
DJ Mountney 2017-11-29 09:37:52 -08:00
parent 6e93d0acbf 446a2c120e
commit 08edd3e4c5
No known key found for this signature in database
GPG Key ID: F07F8D51346CF0B6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-config-template/gitlab.rb.template
View File

@ -1007,7 +1007,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# omnibus_gitconfig['system'] = {
# "pack" => ["threads = 1"],
# "receive" => ["fsckObjects = true"],
# "receive" => ["fsckObjects = true", "advertisePushOptions = true"],
# "repack" => ["writeBitmaps = true"],
# "transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/"],
# }

2
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -22,7 +22,7 @@
default['gitlab']['bootstrap']['enable'] = true
default['gitlab']['omnibus-gitconfig']['system'] = {
"pack" => ["threads = 1"],
"receive" => ["fsckObjects = true"],
"receive" => ["fsckObjects = true", "advertisePushOptions = true"],
"repack" => ["writeBitmaps = true"],
"transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/"],
}

6
spec/chef/recipes/default_spec.rb
View File

@ -24,7 +24,7 @@ describe 'gitlab::default' do
)
gitconfig_hash = {
"receive" => ["fsckObjects = true"],
"receive" => ["fsckObjects = true", "advertisePushOptions = true"],
"pack" => ["threads = 1"],
"repack" => ["writeBitmaps = true"],
"transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/"],
@ -36,7 +36,7 @@ describe 'gitlab::default' do
end
it 'creates the system gitconfig directory and file' do
stub_gitlab_rb(omnibus_gitconfig: { system: { receive: ["fsckObjects = true"], pack: ["threads = 2"] } })
stub_gitlab_rb(omnibus_gitconfig: { system: { receive: ["fsckObjects = true", "advertisePushOptions = true"], pack: ["threads = 2"] } })
expect(chef_run).to create_directory('/opt/gitlab/embedded/etc').with(
user: 'root',
@ -45,7 +45,7 @@ describe 'gitlab::default' do
)
gitconfig_hash = {
"receive" => ["fsckObjects = true"],
"receive" => ["fsckObjects = true", "advertisePushOptions = true"],
"pack" => ["threads = 2"],
"repack" => ["writeBitmaps = true"],
"transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/"],