diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-10 12:10:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-10 12:10:08 +0300 |
commit | 5adf6557e251c047ed68bac28cfecf9491ee6b41 (patch) | |
tree | a7ea2924ef96ccf36a915ddaf686f5f6e1e75b00 /config | |
parent | 0adc81d8e0c7b291fd7fdef33a4ea9c01b4852ce (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
11 files changed, 53 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 4c9c4711c66..e6608ddbc20 100644 --- a/config/application.rb +++ b/config/application.rb @@ -168,6 +168,11 @@ module Gitlab # like if you have constraints or database-specific column types config.active_record.schema_format = :sql + # Dump all DB schemas even if schema_search_path is defined, + # so that we get the same db/structure.sql + # regardless if schema_search_path is set, or not. + config.active_record.dump_schemas = :all + # Use new connection handling so that we can use Rails 6.1+ multiple # database support. config.active_record.legacy_connection_handling = false diff --git a/config/feature_flags/development/get_tag_signatures.yml b/config/feature_flags/development/get_tag_signatures.yml new file mode 100644 index 00000000000..e0d7d5d6dcf --- /dev/null +++ b/config/feature_flags/development/get_tag_signatures.yml @@ -0,0 +1,8 @@ +--- +name: get_tag_signatures +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67000 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337842 +milestone: '14.2' +type: development +group: group::gitaly +default_enabled: false 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 2aec3aaa14c..2cec39f73ce 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 @@ -10,6 +10,10 @@ value_type: number status: data_available time_frame: 28d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_terraform_state_api_unique_users distribution: - ce - ee diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml index ec5b2045f1c..babaaae2225 100644 --- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml +++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml @@ -10,6 +10,10 @@ value_type: number status: data_available time_frame: 28d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - o_pipeline_authoring_unique_users_committing_ciconfigfile distribution: - ee - ce diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml index 680061913d1..7c3ba5fc1dc 100644 --- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml +++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml @@ -12,6 +12,10 @@ milestone: "13.10" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707 time_frame: 28d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile distribution: - ce - ee diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml index 58f8c709d3f..bae8dd4d544 100644 --- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml +++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml @@ -12,6 +12,10 @@ milestone: '13.11' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133 time_frame: 28d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_expanding_secure_security_report distribution: - ce - ee diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml index 2d2b9fd4fe8..03f4ed9ce85 100644 --- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml @@ -12,7 +12,12 @@ status: data_available milestone: "13.12" introduced_by_url: time_frame: 28d -data_source: +data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - o_pipeline_authoring_unique_users_committing_ciconfigfile + - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile distribution: - ce - ee diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml index f032e8a8558..1a81aabe9ac 100644 --- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml +++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml @@ -10,6 +10,10 @@ value_type: number status: data_available time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - o_pipeline_authoring_unique_users_committing_ciconfigfile distribution: - ee - ce diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml index c0fe97815d9..d89ad057a55 100644 --- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml +++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml @@ -12,6 +12,10 @@ milestone: "13.10" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707 time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile distribution: - ce - ee diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml index f4ade05ed51..f6de8e608e3 100644 --- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml +++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml @@ -12,6 +12,10 @@ milestone: '13.11' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133 time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_expanding_secure_security_report distribution: - ce - ee diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml index 259bc4f4357..85cc6f63db1 100644 --- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml +++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml @@ -12,7 +12,12 @@ status: data_available milestone: "13.12" introduced_by_url: time_frame: 7d -data_source: +data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - o_pipeline_authoring_unique_users_committing_ciconfigfile + - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile distribution: - ce - ee |