diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 03:08:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 03:08:51 +0000 |
| commit | b9abe8515111c39c65321258d760aaf4773cb55f (patch) | |
| tree | a58816df2053183f855389c37945ed17578a76aa /config | |
| parent | fa1b90364dc73f27dc78b9d27114e4a197f2cfcb (diff) | |
| download | gitlab-ce-b9abe8515111c39c65321258d760aaf4773cb55f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/limited_commit_parser.yml | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/metrics/settings/20230328165533_mode.yml | 23 |
3 files changed, 34 insertions, 0 deletions
diff --git a/config/feature_flags/development/limited_commit_parser.yml b/config/feature_flags/development/limited_commit_parser.yml new file mode 100644 index 00000000000..026d7824aaf --- /dev/null +++ b/config/feature_flags/development/limited_commit_parser.yml @@ -0,0 +1,8 @@ +--- +name: limited_commit_parser +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117188 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406461 +milestone: '15.11' +type: development +group: group::source code +default_enabled: false diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 24e5a93581a..2b31c6c55d7 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -685,6 +685,9 @@ Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker']['job_class'] = 'C Settings.cron_jobs['cleanup_dangling_debian_package_files_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['cron'] ||= '20 21 * * *' Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['job_class'] = 'Packages::Debian::CleanupDanglingPackageFilesWorker' +Settings.cron_jobs['global_metrics_update_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['global_metrics_update_worker']['cron'] ||= '*/1 * * * *' +Settings.cron_jobs['global_metrics_update_worker']['job_class'] ||= 'Metrics::GlobalMetricsUpdateWorker' Gitlab.ee do Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({}) diff --git a/config/metrics/settings/20230328165533_mode.yml b/config/metrics/settings/20230328165533_mode.yml new file mode 100644 index 00000000000..bc8019d86aa --- /dev/null +++ b/config/metrics/settings/20230328165533_mode.yml @@ -0,0 +1,23 @@ +--- +key_path: database.mode +description: What PostgreSQL database mode is used. Possible values are + "single-database", "single-database-ci-connection", or "multiple-databases" +product_section: enablement +product_stage: enablement +product_group: database +product_category: database +value_type: string +status: active +milestone: "15.11" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115900 +time_frame: none +instrumentation_class: DatabaseMode +data_source: system +data_category: optional +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate |