diff options
author | Rémy Coutable <remy@rymai.me> | 2019-03-18 14:32:26 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-04-04 11:06:11 +0200 |
commit | f37f28b962376843e7682dad15067edb131ecdd8 (patch) | |
tree | 9ffc89724cfc6d03123c152ea2b0c7f60d7ec72c /db | |
parent | a6e9175fdd7790cc433ba49a85eaadbf75a3c8e9 (diff) | |
download | gitlab-ce-f37f28b962376843e7682dad15067edb131ecdd8.tar.gz |
Fix race cond. in ApplicationSettingImplementation.create_from_defaults59162-fix-review-apps-initial-seeding
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'db')
-rw-r--r-- | db/fixtures/development/02_application_settings.rb | 10 | ||||
-rw-r--r-- | db/fixtures/development/02_settings.rb | 8 | ||||
-rw-r--r-- | db/fixtures/development/08_settings.rb | 7 | ||||
-rw-r--r-- | db/fixtures/production/001_application_settings.rb | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/db/fixtures/development/02_application_settings.rb b/db/fixtures/development/02_application_settings.rb new file mode 100644 index 00000000000..d604f0be3cd --- /dev/null +++ b/db/fixtures/development/02_application_settings.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +puts "Creating the default ApplicationSetting record.".color(:green) +Gitlab::CurrentSettings.current_application_settings + +# Details https://gitlab.com/gitlab-org/gitlab-ce/issues/46241 +puts "Enable hashed storage for every new projects.".color(:green) +ApplicationSetting.current_without_cache.update!(hashed_storage_enabled: true) + +print '.' diff --git a/db/fixtures/development/02_settings.rb b/db/fixtures/development/02_settings.rb deleted file mode 100644 index 3a4a5d436bf..00000000000 --- a/db/fixtures/development/02_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -# Enable hashed storage, in development mode, for all projects by default. -Gitlab::Seeder.quiet do - ApplicationSetting.create_from_defaults unless ApplicationSetting.current_without_cache - ApplicationSetting.current_without_cache.update!(hashed_storage_enabled: true) - print '.' -end diff --git a/db/fixtures/development/08_settings.rb b/db/fixtures/development/08_settings.rb deleted file mode 100644 index 141465c06cf..00000000000 --- a/db/fixtures/development/08_settings.rb +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/db/fixtures/production/001_application_settings.rb b/db/fixtures/production/001_application_settings.rb index ab15717e9a9..cf647650142 100644 --- a/db/fixtures/production/001_application_settings.rb +++ b/db/fixtures/production/001_application_settings.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + puts "Creating the default ApplicationSetting record.".color(:green) Gitlab::CurrentSettings.current_application_settings |