diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 06:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 06:08:52 +0300 |
commit | 123582839259a70910bd0e9109e57ed65d71cb23 (patch) | |
tree | da3c33793182af05f67bf27e071168df94711376 /config | |
parent | a0e1fa9aada57f1fde912890e96f867ac540ab03 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
18 files changed, 37 insertions, 47 deletions
diff --git a/config/feature_flags/development/include_descendant_shares_in_user_autocomplete.yml b/config/feature_flags/development/include_descendant_shares_in_user_autocomplete.yml new file mode 100644 index 00000000000..3544c474a20 --- /dev/null +++ b/config/feature_flags/development/include_descendant_shares_in_user_autocomplete.yml @@ -0,0 +1,8 @@ +--- +name: include_descendant_shares_in_user_autocomplete +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126559 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419669 +milestone: '16.3' +type: development +group: group::project management +default_enabled: false diff --git a/config/initializers/active_record_relation_union_reset.rb b/config/initializers/active_record_relation_union_reset.rb deleted file mode 100644 index b8b3d634a61..00000000000 --- a/config/initializers/active_record_relation_union_reset.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -module ActiveRecordRelationUnionReset - MAX_RESET_PERIOD = 10.minutes - - def exec_queries - super - rescue ActiveRecord::StatementInvalid => e - if reset_on_statement_invalid?(e) - class_to_be_reset = klass.base_class - - class_to_be_reset.reset_column_information - Gitlab::ErrorTracking.log_exception(e, { reset_model_name: class_to_be_reset.name }) - - class_to_be_reset.previous_reset_columns_from_error = Time.now - end - - raise - end - - private - - def reset_on_statement_invalid?(exception) - return false unless exception.message.include?("each UNION query must have the same number of columns") - - return false if klass.base_class.previous_reset_columns_from_error? && - klass.base_class.previous_reset_columns_from_error > MAX_RESET_PERIOD.ago - - Feature.enabled?(:reset_column_information_on_statement_invalid, type: :ops) - end -end - -ActiveSupport.on_load(:active_record) do - ActiveRecord::Base.class_attribute :previous_reset_columns_from_error - ActiveRecord::Relation.prepend(ActiveRecordRelationUnionReset) -end diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml index 53c10d5f253..b6c1f2ea507 100644 --- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml @@ -42,5 +42,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: '<13.9' diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml index 9000f412607..b027957e130 100644 --- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml +++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml @@ -18,5 +18,6 @@ tier: - premium - ultimate name: 'count_distinct_user_id_from_enabled_clusters_attached_to_projects' -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml index 5ee19950f49..28a9d320746 100644 --- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml @@ -43,4 +43,5 @@ performance_indicator_type: - smau - gmau - paid_gmau +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml index a9bc74e96e6..22ed6967e32 100644 --- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml @@ -59,4 +59,5 @@ performance_indicator_type: - smau - gmau - paid_gmau +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml index b0c5b961263..84c8d986b18 100644 --- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml +++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml @@ -20,5 +20,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml index 8e6c286aa32..a34abaf4b9c 100644 --- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml @@ -35,4 +35,5 @@ tier: performance_indicator_type: - smau - gmau +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml index 54011fb87ce..1193654a75f 100644 --- a/config/metrics/counts_all/20210204124932_clusters.yml +++ b/config/metrics/counts_all/20210204124932_clusters.yml @@ -16,4 +16,6 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml index 3106b6bf7bb..0a68a3db1ee 100644 --- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml +++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml @@ -14,5 +14,6 @@ distribution: - ee tier: - free -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml index bd067804cbb..3126519fb36 100644 --- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml +++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml @@ -17,6 +17,7 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml index b1141edc39c..d0fa2c434d2 100644 --- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml +++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml @@ -19,5 +19,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml index 28bf9101656..53e2abe35c0 100644 --- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml +++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml @@ -19,5 +19,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml index 8a9a3ce892a..89f1a578b0b 100644 --- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml +++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml @@ -16,4 +16,6 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml index c82411850d5..283bda46c86 100644 --- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml +++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml @@ -16,7 +16,8 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112571 milestone_removed: "15.10" diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml index bfb402c257e..2e1bbeca9a2 100644 --- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml +++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml @@ -19,5 +19,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml index 32f91f6faf6..3bbad9b4e62 100644 --- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml +++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml index df53d2784d2..4e035f5bb5a 100644 --- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml +++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" |