diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-09 03:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-09 03:09:42 +0300 |
| commit | 77914793a349059bf523b131fc925b34349d6884 (patch) | |
| tree | e21ee34216768d49a3309c453a444b5e29675a78 /config | |
| parent | cb36ae7dd5fde175f8a24bfa97b20e9b2e2058bf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/feature_flags/development/sourcegraph.yml | 8 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
5 files changed, 18 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index ba896be894b..9885df5faa8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -198,6 +198,7 @@ module Gitlab config.assets.precompile << "page_bundles/pipeline_schedules.css" config.assets.precompile << "page_bundles/productivity_analytics.css" config.assets.precompile << "page_bundles/profile_two_factor_auth.css" + config.assets.precompile << "page_bundles/security_dashboard.css" config.assets.precompile << "page_bundles/terminal.css" config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/reports.css" diff --git a/config/feature_flags/development/sourcegraph.yml b/config/feature_flags/development/sourcegraph.yml new file mode 100644 index 00000000000..12170aec869 --- /dev/null +++ b/config/feature_flags/development/sourcegraph.yml @@ -0,0 +1,8 @@ +--- +name: sourcegraph +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292199 +milestone: '12.5' +type: development +group: group::editor +default_enabled: false diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 948724bdf76..8f38464d82d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -475,6 +475,10 @@ production: &base # GitLab EE only jobs. These jobs are automatically enabled for an EE # installation, and ignored for a CE installation. ee_cron_jobs: + # Schedule snapshots for all devops adoption segments + analytics_devops_adoption_create_all_snapshots_worker: + cron: 0 0 1 * * + # Snapshot active users statistics historical_data_worker: cron: "0 12 * * *" diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1fae590a4d8..d3efb3d8028 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -541,6 +541,9 @@ Settings.cron_jobs['manage_evidence_worker']['cron'] ||= '0 * * * *' Settings.cron_jobs['manage_evidence_worker']['job_class'] = 'Releases::ManageEvidenceWorker' Gitlab.ee do + Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 0 1 * *' + Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['job_class'] = 'Analytics::DevopsAdoption::CreateAllSnapshotsWorker' Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *' Settings.cron_jobs['active_user_count_threshold_worker']['job_class'] = 'ActiveUserCountThresholdWorker' diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index ac339bae2a9..74a20970079 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -30,6 +30,8 @@ - 1 - - analytics_code_review_metrics - 1 +- - analytics_devops_adoption_create_snapshot + - 1 - - analytics_instance_statistics_counter_job - 1 - - approve_blocked_users |