Merge branch 'lfs-on' into 'master'

enable Git LFS by default

By passing through settings from
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L139

Replaces !701.

See merge request !715
This commit is contained in:
Marin Jankovski 2016-04-04 18:52:52 +00:00
commit 223457996a
2 changed files with 2 additions and 1 deletions

View File

@ -8,6 +8,7 @@ omnibus-gitlab repository.
- Updated libicu to 56.1 4de944d9
- Updated liblzma to 5.2.2 4de944d9
- Change the way db:migrate is triggered 3b42520a
- Enable Git LFS by default
8.6.4

View File

@ -103,7 +103,7 @@ default['gitlab']['gitlab-rails']['incoming_email_password'] = nil
default['gitlab']['gitlab-rails']['incoming_email_mailbox_name'] = nil
default['gitlab']['gitlab-rails']['artifacts_enabled'] = true
default['gitlab']['gitlab-rails']['artifacts_path'] = nil
default['gitlab']['gitlab-rails']['lfs_enabled'] = false
default['gitlab']['gitlab-rails']['lfs_enabled'] = nil
default['gitlab']['gitlab-rails']['lfs_storage_path'] = nil
default['gitlab']['gitlab-rails']['elasticsearch_enabled'] = false
default['gitlab']['gitlab-rails']['elasticsearch_host'] = nil