diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-07 17:17:31 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-07 17:17:31 +0000 |
commit | 047aa493280353530d9b10da75e7c058a1f15481 (patch) | |
tree | 44d50b37c8ecea574ea09363856190f205afac8b /db | |
parent | 290ca339adc952bcd939d1782af95f90d3b88716 (diff) | |
parent | 5484ad78691ab45f79f8b2cf8192cbca8fe7c143 (diff) | |
download | gitlab-ce-047aa493280353530d9b10da75e7c058a1f15481.tar.gz |
Merge branch '46241-enable-hashed-storage-for-new-projects-by-default-in-development' into 'master'
Resolve "Enable hashed storage for new projects by default in development"
Closes #46241
See merge request gitlab-org/gitlab-ce!19488
Diffstat (limited to 'db')
-rw-r--r-- | db/fixtures/development/04_project.rb | 4 | ||||
-rw-r--r-- | db/fixtures/development/08_settings.rb | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb index 213c8bca639..51e69879c79 100644 --- a/db/fixtures/development/04_project.rb +++ b/db/fixtures/development/04_project.rb @@ -67,6 +67,10 @@ Sidekiq::Testing.inline! do skip_disk_validation: true } + if i % 2 == 0 + params[:storage_version] = Project::LATEST_STORAGE_VERSION + end + project = Projects::CreateService.new(User.first, params).execute # Seed-Fu runs this entire fixture in a transaction, so the `after_commit` # hook won't run until after the fixture is loaded. That is too late diff --git a/db/fixtures/development/08_settings.rb b/db/fixtures/development/08_settings.rb new file mode 100644 index 00000000000..141465c06cf --- /dev/null +++ b/db/fixtures/development/08_settings.rb @@ -0,0 +1,7 @@ +# We want to enable hashed storage for every new project in development +# Details https://gitlab.com/gitlab-org/gitlab-ce/issues/46241 +Gitlab::Seeder.quiet do + ApplicationSetting.create_from_defaults unless ApplicationSetting.current_without_cache + ApplicationSetting.current_without_cache.update!(hashed_storage_enabled: true) + print '.' +end |