diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-06 16:14:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-06 16:14:47 +0300 |
| commit | 7ab0cadbbdf42fdd316941b3260e294577d649f4 (patch) | |
| tree | 26ed9d750eb7706174afddb43a9e6fab210f2176 /config | |
| parent | 3aad3a0b6ffb1a0fe36db41f81e8bbd3728e5f80 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/recursive_approach_for_all_projects.yml | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/config/feature_flags/development/recursive_approach_for_all_projects.yml b/config/feature_flags/development/recursive_approach_for_all_projects.yml new file mode 100644 index 00000000000..e2d656b7de2 --- /dev/null +++ b/config/feature_flags/development/recursive_approach_for_all_projects.yml @@ -0,0 +1,8 @@ +--- +name: recursive_approach_for_all_projects +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64632 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334817 +milestone: '14.1' +type: development +group: group::fulfillment +default_enabled: true diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 8f4c6492cad..e311a364977 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -577,12 +577,9 @@ Settings.cron_jobs['users_deactivate_dormant_users_worker']['job_class'] = 'User Settings.cron_jobs['ci_delete_unit_tests_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['ci_delete_unit_tests_worker']['cron'] ||= '0 0 * * *' Settings.cron_jobs['ci_delete_unit_tests_worker']['job_class'] = 'Ci::DeleteUnitTestsWorker' - -Gitlab.com do - Settings.cron_jobs['batched_background_migrations_worker'] ||= Settingslogic.new({}) - Settings.cron_jobs['batched_background_migrations_worker']['cron'] ||= '* * * * *' - Settings.cron_jobs['batched_background_migrations_worker']['job_class'] = 'Database::BatchedBackgroundMigrationWorker' -end +Settings.cron_jobs['batched_background_migrations_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['batched_background_migrations_worker']['cron'] ||= '* * * * *' +Settings.cron_jobs['batched_background_migrations_worker']['job_class'] = 'Database::BatchedBackgroundMigrationWorker' Gitlab.ee do Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({}) |