diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 03:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 03:09:13 +0300 |
| commit | bd1813c1773618d30880ca101c4494c96f3d9dd8 (patch) | |
| tree | 13f45a6660cde7ff45a67b8cf2178735be1dd637 /config | |
| parent | 5c2568f176708552dfdefa9fc8d5f01ec6a019a1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 26 insertions, 0 deletions
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml b/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml new file mode 100644 index 00000000000..63432e2f476 --- /dev/null +++ b/config/feature_flags/development/usage_data_incident_management_alert_create_incident.yml @@ -0,0 +1,8 @@ +--- +name: usage_data_incident_management_alert_create_incident +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087 +rollout_issue_url: +milestone: '13.7' +type: development +group: group::monitor +default_enabled: true diff --git a/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml new file mode 100644 index 00000000000..38e94e74399 --- /dev/null +++ b/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml @@ -0,0 +1,8 @@ +--- +name: usage_data_incident_management_alerts_total_unique_counts +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087 +rollout_issue_url: +milestone: '13.7' +type: development +group: group::monitor +default_enabled: false diff --git a/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml new file mode 100644 index 00000000000..1bb602730e7 --- /dev/null +++ b/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml @@ -0,0 +1,8 @@ +--- +name: usage_data_incident_management_incidents_total_unique_counts +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087 +rollout_issue_url: +milestone: '13.7' +type: development +group: group::monitor +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index bdab5e3e646..e4b601bc006 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -32,6 +32,8 @@ - 1 - - analytics_instance_statistics_counter_job - 1 +- - approve_blocked_users + - 1 - - authorized_keys - 2 - - authorized_project_update |