From 77c5e5117764f7974397e5609e35effdc9330276 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 13 Feb 2024 15:11:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/ci-templates.gitlab-ci.yml | 3 +- .rubocop_todo/rspec/feature_category.yml | 1 - GITALY_SERVER_VERSION | 2 +- .../graphql/show/runner_jobs.query.graphql | 8 +-- app/assets/javascripts/diff.js | 2 +- .../fragments/ci_icon.fragment.graphql | 6 ++ .../components/commit_box_pipeline_status.vue | 4 +- .../get_latest_pipeline_status.query.graphql | 7 +-- .../vue_shared/components/ci_icon/ci_icon.vue | 3 + app/helpers/diff_helper.rb | 2 +- app/models/ci/catalog/resource.rb | 2 +- app/models/work_items/widgets/base.rb | 3 + app/services/releases/destroy_service.rb | 2 +- .../ci_redirect_component_project.yml | 8 --- .../ci_rule_exists_extension_optimization.yml | 9 +++ ...0216175402_projects_slack_slash_active.yml | 2 +- .../counts_all/20210216175621_web_hooks.yml | 2 +- .../20210216175625_groups_asana_active.yml | 2 +- .../20210216175627_templates_asana_active.yml | 2 +- ...75630_projects_inheriting_asana_active.yml | 2 +- ...0210216175634_projects_assembla_active.yml | 2 +- ...210216175638_templates_assembla_active.yml | 2 +- ...42_projects_inheriting_assembla_active.yml | 2 +- .../20210216175645_projects_bamboo_active.yml | 2 +- ...175655_groups_inheriting_bamboo_active.yml | 2 +- .../20210216175659_groups_bugzilla_active.yml | 2 +- ...20210216175710_groups_buildkite_active.yml | 2 +- .../20210216175721_groups_campfire_active.yml | 2 +- ...210216175723_templates_campfire_active.yml | 2 +- ...0210216175733_groups_confluence_active.yml | 2 +- ...0216175734_templates_confluence_active.yml | 2 +- ...40_groups_inheriting_confluence_active.yml | 2 +- ...20210216175753_projects_discord_active.yml | 2 +- ...75802_groups_inheriting_discord_active.yml | 2 +- ...210216175807_templates_drone_ci_active.yml | 2 +- ...11_projects_inheriting_drone_ci_active.yml | 2 +- ...5813_groups_inheriting_drone_ci_active.yml | 2 +- ...175818_templates_emails_on_push_active.yml | 2 +- ...roups_inheriting_emails_on_push_active.yml | 2 +- ...0216175828_groups_external_wiki_active.yml | 2 +- ...6175829_templates_external_wiki_active.yml | 2 +- ...5846_groups_inheriting_flowdock_active.yml | 2 +- ...0216175901_groups_hangouts_chat_active.yml | 2 +- ...6175904_instances_hangouts_chat_active.yml | 2 +- ...ojects_inheriting_hangouts_chat_active.yml | 2 +- ...20210216175910_projects_hipchat_active.yml | 2 +- ...0210216175915_instances_hipchat_active.yml | 2 +- ...6175930_groups_inheriting_irker_active.yml | 2 +- ...20210216175932_projects_jenkins_active.yml | 2 +- ...75941_groups_inheriting_jenkins_active.yml | 2 +- .../20210216175943_projects_jira_active.yml | 2 +- .../20210216175948_instances_jira_active.yml | 2 +- ...175950_projects_inheriting_jira_active.yml | 2 +- ...ances_mattermost_slash_commands_active.yml | 2 +- ...iting_mattermost_slash_commands_active.yml | 2 +- ...iting_mattermost_slash_commands_active.yml | 2 +- ...16180018_groups_microsoft_teams_active.yml | 2 +- ...20210216180029_groups_packagist_active.yml | 2 +- ...10216180030_templates_packagist_active.yml | 2 +- ...16180040_groups_pipelines_email_active.yml | 2 +- ...80043_instances_pipelines_email_active.yml | 2 +- ...ects_inheriting_pipelines_email_active.yml | 2 +- ...oups_inheriting_pipelines_email_active.yml | 2 +- ...6180049_projects_pivotaltracker_active.yml | 2 +- ...180052_templates_pivotaltracker_active.yml | 2 +- ...roups_inheriting_pivotaltracker_active.yml | 2 +- ...210216180105_instances_pushover_active.yml | 2 +- ...07_projects_inheriting_pushover_active.yml | 2 +- ...20210216180111_projects_redmine_active.yml | 2 +- .../20210216180113_groups_redmine_active.yml | 2 +- .../20210216180124_groups_slack_active.yml | 2 +- ...80129_projects_inheriting_slack_active.yml | 2 +- ...135_groups_slack_slash_commands_active.yml | 2 +- ...inheriting_slack_slash_commands_active.yml | 2 +- ...inheriting_slack_slash_commands_active.yml | 2 +- ...0210216180144_projects_teamcity_active.yml | 2 +- ...210216180148_templates_teamcity_active.yml | 2 +- ...51_projects_inheriting_teamcity_active.yml | 2 +- ...16180155_projects_unify_circuit_active.yml | 2 +- ...6180201_instances_unify_circuit_active.yml | 2 +- ...ojects_inheriting_unify_circuit_active.yml | 2 +- ...projects_inheriting_webex_teams_active.yml | 2 +- ...5_groups_inheriting_webex_teams_active.yml | 2 +- ...25_projects_inheriting_youtrack_active.yml | 2 +- ...0216180228_projects_jira_server_active.yml | 2 +- ...1258_jira_imports_total_imported_count.yml | 2 +- ...20210216182547_projects_datadog_active.yml | 2 +- ...0210216182551_templates_datadog_active.yml | 2 +- .../20210216182616_groups_ewm_active.yml | 2 +- .../20210216182620_instances_ewm_active.yml | 2 +- ...6182622_projects_inheriting_ewm_active.yml | 2 +- ...20210216182722_projects_mock_ci_active.yml | 2 +- ...730_projects_inheriting_mock_ci_active.yml | 2 +- ...82732_groups_inheriting_mock_ci_active.yml | 2 +- ...182734_projects_mock_monitoring_active.yml | 2 +- ...82738_templates_mock_monitoring_active.yml | 2 +- ...ects_inheriting_mock_monitoring_active.yml | 2 +- .../20210730011801_projects_zentao_active.yml | 2 +- .../20210730011802_groups_zentao_active.yml | 2 +- ...groups_gitlab_slack_application_active.yml | 2 +- ...riting_gitlab_slack_application_active.yml | 2 +- .../20211028210002_groups_shimo_active.yml | 2 +- ...8210005_groups_inheriting_shimo_active.yml | 2 +- ...141715_groups_inheriting_pumble_active.yml | 2 +- ...20220802141715_instances_pumble_active.yml | 2 +- ...1715_projects_inheriting_pumble_active.yml | 2 +- ...1_groups_inheriting_google_play_active.yml | 2 +- ...30303132041_instances_squash_tm_active.yml | 2 +- ...230303132352_projects_squash_tm_active.yml | 2 +- .../20230515153810_groups_clickup_active.yml | 2 +- ...0230515153827_instances_clickup_active.yml | 2 +- ...20230515153829_projects_clickup_active.yml | 2 +- ...230607171201_instances_telegram_active.yml | 2 +- ...205140200_groups_diffblue_cover_active.yml | 2 +- ...5140200_projects_diffblue_cover_active.yml | 2 +- db/docs/operations_feature_flags_issues.yml | 17 +++++- db/docs/operations_strategies.yml | 17 +++++- db/docs/operations_strategies_user_lists.yml | 17 +++++- doc/api/graphql/reference/index.md | 12 +--- doc/development/ai_features/index.md | 2 +- doc/integration/jira/configure.md | 30 ++++++++- doc/integration/jira/issues.md | 23 ------- .../ci/build/rules/rule/clause/exists.rb | 61 +++++++++++++++++-- lib/gitlab/ci/components/instance_path.rb | 36 ++--------- locale/gitlab.pot | 23 +------ package.json | 2 +- .../explore/catalog/catalog_details_spec.rb | 4 +- .../commit_box_pipeline_status_spec.js | 8 ++- spec/frontend/commit/mock_data.js | 4 +- spec/frontend/diff_spec.js | 10 +-- spec/helpers/diff_helper_spec.rb | 24 ++++++++ .../ci/build/rules/rule/clause/exists_spec.rb | 12 +++- .../ci/components/instance_path_spec.rb | 31 ---------- spec/models/ci/catalog/listing_spec.rb | 8 ++- spec/models/ci/catalog/resource_spec.rb | 10 +-- .../explore/catalog_controller_spec.rb | 6 +- .../services/releases/destroy_service_spec.rb | 4 +- .../rule/clause/clause_shared_examples.rb | 7 +++ .../javascripts/jquery.endless-scroll.js | 1 + yarn.lock | 8 +-- 140 files changed, 355 insertions(+), 284 deletions(-) create mode 100644 app/assets/javascripts/graphql_shared/fragments/ci_icon.fragment.graphql delete mode 100644 config/feature_flags/development/ci_redirect_component_project.yml create mode 100644 config/feature_flags/gitlab_com_derisk/ci_rule_exists_extension_optimization.yml diff --git a/.gitlab/ci/ci-templates.gitlab-ci.yml b/.gitlab/ci/ci-templates.gitlab-ci.yml index a00de8cb533..ab7a3c0bacf 100644 --- a/.gitlab/ci/ci-templates.gitlab-ci.yml +++ b/.gitlab/ci/ci-templates.gitlab-ci.yml @@ -9,5 +9,6 @@ templates-shellcheck: needs: - setup-test-env script: - - apt update && apt install -y shellcheck=0.7.1-1+deb11u1 + # Try bullseye (0.7) first and then bookworm (0.9) + - apt update && apt install -y shellcheck=0.7.1-1+deb11u1 || apt install -y shellcheck=0.9.0-1 - bundle exec scripts/lint_templates_bash.rb diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 6f3b6141d36..bfb96e1a6a1 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -2840,7 +2840,6 @@ RSpec/FeatureCategory: - 'spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb' - 'spec/lib/gitlab/ci/build/releaser_spec.rb' - 'spec/lib/gitlab/ci/build/rules/rule/clause/changes_spec.rb' - - 'spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb' - 'spec/lib/gitlab/ci/build/rules/rule/clause_spec.rb' - 'spec/lib/gitlab/ci/build/rules/rule_spec.rb' - 'spec/lib/gitlab/ci/build/rules_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index d03d56367fd..ea697621ea7 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -5274274cf9ea696f8bdb95687a0f9591b73b6550 +af2fbf3d304a0cd637f8b9ea47817b8c9b6f109b diff --git a/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql b/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql index 611de43b995..005fa8f92e1 100644 --- a/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql +++ b/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql @@ -1,3 +1,4 @@ +#import "~/graphql_shared/fragments/ci_icon.fragment.graphql" #import "~/graphql_shared/fragments/page_info.fragment.graphql" query getRunnerJobs($id: CiRunnerID!, $first: Int, $last: Int, $before: String, $after: String) { @@ -8,12 +9,7 @@ query getRunnerJobs($id: CiRunnerID!, $first: Int, $last: Int, $before: String, nodes { id detailedStatus { - # fields for `` - id - detailsPath - group - icon - text + ...CiIcon } project { id diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index e3cd43ac22f..0c31443e5f7 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -142,7 +142,7 @@ export default class Diff { } viewTypeSwitch(event) { const click = event.originalEvent; - const diffSource = new URL(click.target.getAttribute('href'), document.location.href); + const diffSource = new URL(event.currentTarget.getAttribute('href'), document.location.href); if (this.mrHub) { click.preventDefault(); diff --git a/app/assets/javascripts/graphql_shared/fragments/ci_icon.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/ci_icon.fragment.graphql new file mode 100644 index 00000000000..67d9c2cc600 --- /dev/null +++ b/app/assets/javascripts/graphql_shared/fragments/ci_icon.fragment.graphql @@ -0,0 +1,6 @@ +fragment CiIcon on DetailedStatus { + id + icon + text + detailsPath +} diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue index d2901500459..8c2590b2849 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue @@ -46,7 +46,7 @@ export default { }, data() { return { - pipelineStatus: {}, + pipelineStatus: null, }; }, computed: { @@ -63,6 +63,6 @@ export default { diff --git a/app/assets/javascripts/projects/commit_box/info/graphql/queries/get_latest_pipeline_status.query.graphql b/app/assets/javascripts/projects/commit_box/info/graphql/queries/get_latest_pipeline_status.query.graphql index cec96f82336..8de813cff13 100644 --- a/app/assets/javascripts/projects/commit_box/info/graphql/queries/get_latest_pipeline_status.query.graphql +++ b/app/assets/javascripts/projects/commit_box/info/graphql/queries/get_latest_pipeline_status.query.graphql @@ -1,13 +1,12 @@ +#import "~/graphql_shared/fragments/ci_icon.fragment.graphql" + query getLatestPipelineStatus($fullPath: ID!, $iid: ID!) { project(fullPath: $fullPath) { id pipeline(iid: $iid) { id detailedStatus { - id - detailsPath - icon - group + ...CiIcon } } } diff --git a/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue b/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue index a2b6b4642c9..1a22edc2beb 100644 --- a/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue +++ b/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue @@ -11,6 +11,9 @@ import { GlBadge, GlTooltipDirective, GlIcon } from '@gitlab/ui'; * detailsPath: '/project1/jobs/1' // can also be details_path * } * + * You may use ~/graphql_shared/fragments/ci_icon.fragment.graphql to fetch this + * from the GraphQL API. + * */ export default { diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 6069e4e64a1..beab04a6ae1 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -254,7 +254,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn gl-button btn-default selected' : 'btn gl-button btn-default'), data: { view_type: name } do + link_button_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'selected' : ''), data: { view_type: name } do title end end diff --git a/app/models/ci/catalog/resource.rb b/app/models/ci/catalog/resource.rb index a1c03d3883f..73f4356bdbf 100644 --- a/app/models/ci/catalog/resource.rb +++ b/app/models/ci/catalog/resource.rb @@ -38,7 +38,7 @@ module Ci delegate :avatar_path, :star_count, :full_path, to: :project - enum state: { draft: 0, published: 1 } + enum state: { unpublished: 0, published: 1 } before_create :sync_with_project diff --git a/app/models/work_items/widgets/base.rb b/app/models/work_items/widgets/base.rb index c4e87decdbf..86541cb599c 100644 --- a/app/models/work_items/widgets/base.rb +++ b/app/models/work_items/widgets/base.rb @@ -41,3 +41,6 @@ module WorkItems end end end + +WorkItems::Widgets::Base.prepend_mod +WorkItems::Widgets::Base.prepend_mod_with('WorkItems::Widgets::Base::ClassMethods') diff --git a/app/services/releases/destroy_service.rb b/app/services/releases/destroy_service.rb index 1e8338651a8..8522f6c5776 100644 --- a/app/services/releases/destroy_service.rb +++ b/app/services/releases/destroy_service.rb @@ -26,7 +26,7 @@ module Releases return unless project.catalog_resource.versions.none? - project.catalog_resource.update!(state: 'draft') + project.catalog_resource.update!(state: 'unpublished') end def allowed? diff --git a/config/feature_flags/development/ci_redirect_component_project.yml b/config/feature_flags/development/ci_redirect_component_project.yml deleted file mode 100644 index 205805914a4..00000000000 --- a/config/feature_flags/development/ci_redirect_component_project.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_redirect_component_project -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139254 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434511 -milestone: '16.8' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/config/feature_flags/gitlab_com_derisk/ci_rule_exists_extension_optimization.yml b/config/feature_flags/gitlab_com_derisk/ci_rule_exists_extension_optimization.yml new file mode 100644 index 00000000000..f0870c2f12c --- /dev/null +++ b/config/feature_flags/gitlab_com_derisk/ci_rule_exists_extension_optimization.yml @@ -0,0 +1,9 @@ +--- +name: ci_rule_exists_extension_optimization +feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/227632 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143056 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17531 +milestone: '16.9' +group: group::pipeline authoring +type: gitlab_com_derisk +default_enabled: false diff --git a/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml b/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml index 4bbeabd7c87..92413823626 100644 --- a/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml +++ b/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.projects_slack_slash_active description: Unique projects with Slack ‘/’ commands enabled product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml index 19b165263a0..7af11227e28 100644 --- a/config/metrics/counts_all/20210216175621_web_hooks.yml +++ b/config/metrics/counts_all/20210216175621_web_hooks.yml @@ -4,7 +4,7 @@ key_path: counts.web_hooks description: Count of web hooks product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml index 0e88289e9b8..98081626ffb 100644 --- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml +++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_asana_active description: Count of groups with active integrations for Asana product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml index 1011147e4a7..9d1be1531d9 100644 --- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml +++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_asana_active description: Count of active service templates for Asana product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml index 4bfbcbea97d..39f3286fd73 100644 --- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml +++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_asana_active description: Count of active projects inheriting integrations for Asana product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml index 389f7c60088..004ddc3ea11 100644 --- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml +++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_assembla_active description: Count of projects with active integrations for Assembla product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml index d874954dc57..a98c4cc340a 100644 --- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml +++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_assembla_active description: Count of active service templates for Assembla product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml index 6f5071302f5..1036cf6dbed 100644 --- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml +++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_assembla_active description: Count of active projects inheriting integrations for Assembla product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml index 218e56109c1..ca87125ec15 100644 --- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml +++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_bamboo_active description: Count of projects with active integrations for Bamboo CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml index 171d6defe06..059d25365af 100644 --- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml +++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_bamboo_active description: Count of active groups inheriting integrations for Bamboo CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml index de93b1c1b52..2fda969c720 100644 --- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml +++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_bugzilla_active description: Count of groups with active integrations for Bugzilla product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml index b1b1d2dec23..eadee50ba62 100644 --- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml +++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_buildkite_active description: Count of groups with active integrations for Buildkite product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml index 74d0023e7be..d2a2e51101b 100644 --- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml +++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_campfire_active description: Count of groups with active integrations for Campfire product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml index 755bbea11b5..22911be6d47 100644 --- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml +++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_campfire_active description: Count of active service templates for Campfire product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml index aecf743467b..20554f83dd2 100644 --- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml +++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_confluence_active description: Count of groups with active integrations for Confluence product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml index d5564464e7a..96c29680a24 100644 --- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml +++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_confluence_active description: Count of active service templates for Confluence product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml index 0c3f0d38dbe..c5c0b55e451 100644 --- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml +++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_confluence_active description: Count of active groups inheriting integrations for Confluence product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml index 137608e391c..5a0cd1556bc 100644 --- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml +++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_discord_active description: Count of projects with active integrations for Discord product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml index 03f7cee6039..1d744c4b16b 100644 --- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml +++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_discord_active description: Count of active groups inheriting integrations for Discord product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml index b8b9ab1aa08..3d5cb8bee56 100644 --- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml +++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_drone_ci_active description: Count of active service templates for Drone CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml index ebe7a2d45ce..91b37374beb 100644 --- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml +++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_drone_ci_active description: Count of active projects inheriting integrations for Drone CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml index d21efb0213f..a289d51b276 100644 --- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml +++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_drone_ci_active description: Count of active groups inheriting integrations for Drone CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml index 81a9ba24425..81801ceb35f 100644 --- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml +++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_emails_on_push_active description: Count of active service templates for Emails on Push product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml index f718316d2b1..88049aeb275 100644 --- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml +++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_emails_on_push_active description: Count of active groups inheriting integrations for Emails on Push product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml index 2a1f9c976ea..7ab78a70b92 100644 --- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml +++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_external_wiki_active description: Count of groups with active integrations for External Wiki product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml index 0e6cd4a4169..e2e115d56c9 100644 --- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml +++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_external_wiki_active description: Count of active service templates for External Wiki product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml index b55b9132a4c..b250b0fc8a4 100644 --- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_flowdock_active description: Count of active groups inheriting integrations for Flowdock product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394 diff --git a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml index cb11d7ff1a0..71e04afb535 100644 --- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml +++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_hangouts_chat_active description: Count of groups with active integrations for Hangouts Chat product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml index d0e42de5086..4d1067d018f 100644 --- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml +++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_hangouts_chat_active description: Count of active instance-level integrations for Hangouts Chat product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml index 0c67c33eeb2..bed4a51303e 100644 --- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml +++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_hangouts_chat_active description: Count of active projects inheriting integrations for Hangouts Chat product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml index dbe69e2f99c..b8e9c3c64e1 100644 --- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml +++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_hipchat_active description: Count of projects with active integrations for HipChat product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.11' diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml index c160b7a45d8..a3b6dce0d5b 100644 --- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml +++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_hipchat_active description: Count of active instance-level integrations for HipChat product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.11' diff --git a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml index 03a1af03ce8..8630734309b 100644 --- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml +++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_irker_active description: Count of active groups inheriting integrations for Irker product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml index 88c8b518cfd..b9baf0c4f30 100644 --- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml +++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_jenkins_active description: Count of projects with active integrations for Jenkins product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml index 2766a6e1e3c..077ca4185fe 100644 --- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml +++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_jenkins_active description: Count of active groups inheriting integrations for Jenkins product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml index 248ec9c32ce..e13f35c22b4 100644 --- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml +++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_jira_active description: Count of projects with active integrations for Jira product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml index 7c1561e72d7..30400d45c8f 100644 --- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml +++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_jira_active description: Count of active instance-level integrations for Jira product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml index 415b8665dc3..d2d22e94361 100644 --- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml +++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_jira_active description: Count of active projects inheriting integrations for Jira product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml index c17fe82c500..01fc5cb6896 100644 --- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_mattermost_slash_commands_active description: Count of active instance-level integrations for Mattermost (slash commands) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml index 02f684972b7..02b1df30873 100644 --- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml @@ -5,7 +5,7 @@ description: Count of active projects inheriting integrations for Mattermost (sl commands) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml index 21d4aae8a0a..1610a4fedea 100644 --- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml @@ -5,7 +5,7 @@ description: Count of active groups inheriting integrations for Mattermost (slas commands) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml index 2a3fd51cd1d..b7381d0b621 100644 --- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml +++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_microsoft_teams_active description: Count of groups with active integrations for Microsoft Teams product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml index f5c014370cc..89042f997e5 100644 --- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml +++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_packagist_active description: Count of groups with active integrations for Packagist product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml index a6419bd2c6b..9d40214eef8 100644 --- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml +++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_packagist_active description: Count of active service templates for Packagist product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml index 5be9cf45186..eb9b1ea7a2e 100644 --- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml +++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_pipelines_email_active description: Count of groups with active integrations for Pipeline Emails product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml index 83aa8997e86..9b4eee076a9 100644 --- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml +++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_pipelines_email_active description: Count of active instance-level integrations for Pipeline Emails product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml index 705c4b77497..95934a1ddcc 100644 --- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml +++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pipelines_email_active description: Count of active projects inheriting integrations for Pipeline Emails product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml index 5b3d48d2a58..fb86591e0d1 100644 --- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml +++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pipelines_email_active description: Count of active groups inheriting integrations for Pipeline Emails product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml index 1bc23715ecf..e8811d48993 100644 --- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml +++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_pivotaltracker_active description: Count of projects with active integrations for Pivotal Tracker product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml index d78e1fd6694..70a3228ea06 100644 --- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml +++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_pivotaltracker_active description: Count of active service templates for Pivotal Tracker product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml index 4a8b3083608..c4fd9d7ced1 100644 --- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml +++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pivotaltracker_active description: Count of active groups inheriting integrations for Pivotal Tracker product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml index 8977c57d6a7..a0aabf1a93e 100644 --- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml +++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_pushover_active description: Count of active instance-level integrations for Pushover product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml index fd1a2041563..8c56b6ae6ec 100644 --- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml +++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pushover_active description: Count of active projects inheriting integrations for Pushover product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml index 8fd63c93316..3dd807a5c71 100644 --- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml +++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_redmine_active description: Count of projects with active integrations for Redmine product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml index 6c5d5b3f0ea..96b50fec06c 100644 --- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml +++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_redmine_active description: Count of groups with active integrations for Redmine product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml index e75fcb1d155..268cfcb7dd2 100644 --- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml +++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_slack_active description: Count of groups with active integrations for Slack product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml index 95dd89a1b6d..59c08f378b1 100644 --- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml +++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_slack_active description: Count of active projects inheriting integrations for Slack product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml index e0a2ad4160e..10186c3a1bf 100644 --- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_slack_slash_commands_active description: Count of groups with active integrations for Slack (slash commands) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml index 945d68d6017..2e4e1dc9c71 100644 --- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_slack_slash_commands_active description: Count of active projects inheriting integrations for Slack (slash commands) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml index dcc4de87d47..ca56ffcec93 100644 --- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_slack_slash_commands_active description: Count of active groups inheriting integrations for Slack (slash commands) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml index 6d4935fafed..3eec9d788f1 100644 --- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml +++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_teamcity_active description: Count of projects with active integrations for Teamcity CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml index d41f1c2cb73..22aa65903b6 100644 --- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml +++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_teamcity_active description: Count of active service templates for Teamcity CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml index 56ca14fecc2..349142e34c1 100644 --- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml +++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_teamcity_active description: Count of active projects inheriting integrations for Teamcity CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml index 82f3d56b1a5..c706822136e 100644 --- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml +++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_unify_circuit_active description: Count of projects with active integrations for Unifiy Circuit product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml index daa8f332c46..2d6cbfa1fc8 100644 --- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml +++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_unify_circuit_active description: Count of active instance-level integrations for Unifiy Circuit product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml index c6fa0cf0fea..45d0b2182ec 100644 --- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml +++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_unify_circuit_active description: Count of active projects inheriting integrations for Unifiy Circuit product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml index 38e29e7f5f9..77f98bd841a 100644 --- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml +++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_webex_teams_active description: Count of active projects inheriting integrations for Webex Teams product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml index 7627e2986a6..efba1d075f2 100644 --- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml +++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_webex_teams_active description: Count of active groups inheriting integrations for Webex Teams product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml index 17d262de18b..1772a4f61f7 100644 --- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml +++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_youtrack_active description: Count of active projects inheriting integrations for YouTrack product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml index feda686d183..87caaa80780 100644 --- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml +++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_jira_server_active description: Count of active integrations with Jira Software (server) product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed time_frame: all diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml index 5812515da44..5529893b8b2 100644 --- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml +++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml @@ -4,7 +4,7 @@ key_path: counts.jira_imports_total_imported_count description: Count of Jira imports completed product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml index 46e6776597c..09dd5c6f1b2 100644 --- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml +++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_datadog_active description: Count of projects with active integrations for Datadog product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml index f45b4a93270..64d3500e7d9 100644 --- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml +++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_datadog_active description: Count of active service templates for Datadog product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '14.4' diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml index 180ab4b61b4..6120bf2682c 100644 --- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml +++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_ewm_active description: Count of groups with active integrations for EWM product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml index 3c85cba0764..bc61c719289 100644 --- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml +++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_ewm_active description: Count of active instance-level integrations for EWM product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml index da399896087..21500c85833 100644 --- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml +++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_ewm_active description: Count of active projects inheriting integrations for EWM product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml index f19e8a6526d..380a094f685 100644 --- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml +++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_mock_ci_active description: Count of projects with active integrations for Mock CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.12' diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml index 0b84bac064c..b000b51faa8 100644 --- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml +++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mock_ci_active description: Count of active projects inheriting integrations for Mock CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.12' diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml index 89fb814fc94..d5477bf3752 100644 --- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml +++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mock_ci_active description: Count of active groups inheriting integrations for Mock CI product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.12' diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml index 21d025e3d15..4b4d6d7bcee 100644 --- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml +++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_mock_monitoring_active description: Count of projects with active integrations for Mock Monitoring product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.12' diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml index 375abe3cd5a..246d0cba32c 100644 --- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml +++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml @@ -4,7 +4,7 @@ key_path: counts.templates_mock_monitoring_active description: Count of active service templates for Mock Monitoring product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.12' diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml index 5f9a2360034..8914590bde5 100644 --- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml +++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mock_monitoring_active description: Count of active projects inheriting integrations for Mock Monitoring product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed milestone_removed: '13.12' diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml index e85df2176c2..5000ecab3c6 100644 --- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml +++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml @@ -3,7 +3,7 @@ key_path: counts.projects_zentao_active description: Count of projects with active Zentao integrations product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "14.4" diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml index 8dbcab96fb2..ee5d3a76d02 100644 --- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml +++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml @@ -3,7 +3,7 @@ key_path: counts.groups_zentao_active description: Count of groups with active Zentao integrations product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "14.4" diff --git a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml index aa9fe865b5f..c4491bd20fb 100644 --- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml @@ -3,7 +3,7 @@ key_path: counts.groups_gitlab_slack_application_active description: Count groups with active slack application product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "14.3" diff --git a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml index 96da8a57bd4..a0ce4270c33 100644 --- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml @@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_gitlab_slack_application_active description: Count projects inheriting active slack application product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "14.3" diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml index 95e2e7bbe92..22fce7c4c9d 100644 --- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml +++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml @@ -3,7 +3,7 @@ key_path: counts.groups_shimo_active description: Count of groups with active Shimo integrations product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143 diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml index e973871ed22..bd859d0839f 100644 --- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml +++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml @@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_shimo_active description: Count of groups that inherit active Shimo integrations product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: removed removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143 diff --git a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml index df546f533b7..223369ddba7 100644 --- a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml +++ b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pumble_active description: Count of active groups inheriting integrations for Pumble product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml index e237ea87ea4..db75a094cd3 100644 --- a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml +++ b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml @@ -4,7 +4,7 @@ key_path: counts.instances_pumble_active description: Count of active instance-level integrations for Pumble product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml index f90acd3755f..58ab9ae1cd9 100644 --- a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml +++ b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pumble_active description: Count of active projects inheriting integrations for Pumble product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml index 015e0941ffe..aa738102160 100644 --- a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml +++ b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml @@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_google_play_active description: Count of active groups inheriting integrations for Google Play product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "15.10" diff --git a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml index ec88fbb94c0..08bd783d310 100644 --- a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml +++ b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml @@ -3,7 +3,7 @@ key_path: counts.instances_squash_tm_active description: Count of instance-level integrations for Squash TM product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "15.10" diff --git a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml index c349bf05dae..2849e24cf42 100644 --- a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml +++ b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml @@ -3,7 +3,7 @@ key_path: counts.projects_squash_tm_active description: Count of projects with active integrations for Squash TM product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "15.10" diff --git a/config/metrics/counts_all/20230515153810_groups_clickup_active.yml b/config/metrics/counts_all/20230515153810_groups_clickup_active.yml index b5d999e76fd..e771091c91c 100644 --- a/config/metrics/counts_all/20230515153810_groups_clickup_active.yml +++ b/config/metrics/counts_all/20230515153810_groups_clickup_active.yml @@ -3,7 +3,7 @@ key_path: counts.groups_clickup_active description: Count of groups with active integrations for ClickUp product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "16.1" diff --git a/config/metrics/counts_all/20230515153827_instances_clickup_active.yml b/config/metrics/counts_all/20230515153827_instances_clickup_active.yml index de631475e5d..1e3ec3eb799 100644 --- a/config/metrics/counts_all/20230515153827_instances_clickup_active.yml +++ b/config/metrics/counts_all/20230515153827_instances_clickup_active.yml @@ -3,7 +3,7 @@ key_path: counts.instances_clickup_active description: Count of active instance-level integrations for ClickUp product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "16.1" diff --git a/config/metrics/counts_all/20230515153829_projects_clickup_active.yml b/config/metrics/counts_all/20230515153829_projects_clickup_active.yml index 4f7c8775614..e7a9158c0a0 100644 --- a/config/metrics/counts_all/20230515153829_projects_clickup_active.yml +++ b/config/metrics/counts_all/20230515153829_projects_clickup_active.yml @@ -3,7 +3,7 @@ key_path: counts.projects_clickup_active description: Count of projects with active integrations for ClickUp product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "16.1" diff --git a/config/metrics/counts_all/20230607171201_instances_telegram_active.yml b/config/metrics/counts_all/20230607171201_instances_telegram_active.yml index e76b28d7882..3cef0cf7578 100644 --- a/config/metrics/counts_all/20230607171201_instances_telegram_active.yml +++ b/config/metrics/counts_all/20230607171201_instances_telegram_active.yml @@ -3,7 +3,7 @@ key_path: counts.instances_telegram_active description: Count of active instance-level integrations for Telegram product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active milestone: "16.1" diff --git a/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml index 90662895b46..c1aa946aa70 100644 --- a/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml +++ b/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml @@ -4,7 +4,7 @@ key_path: counts.groups_diffblue_cover_active description: Count of groups with active integrations for Diffblue Cover product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml index b421aef816b..bd4506b777b 100644 --- a/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml +++ b/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml @@ -4,7 +4,7 @@ key_path: counts.projects_diffblue_cover_active description: Count of projects with active integrations for Diffblue Cover product_section: dev product_stage: manage -product_group: integrations +product_group: import_and_integrate value_type: number status: active time_frame: all diff --git a/db/docs/operations_feature_flags_issues.yml b/db/docs/operations_feature_flags_issues.yml index ad361f2e659..b6e2000ec8b 100644 --- a/db/docs/operations_feature_flags_issues.yml +++ b/db/docs/operations_feature_flags_issues.yml @@ -7,4 +7,19 @@ feature_categories: description: https://docs.gitlab.com/ee/operations/feature_flags.html#feature-flag-related-issues introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32876 milestone: '13.1' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +desired_sharding_key: + project_id: + references: projects + backfill_via: + parent: + foreign_key: feature_flag_id + table: operations_feature_flags + sharding_key: project_id + belongs_to: feature_flag diff --git a/db/docs/operations_strategies.yml b/db/docs/operations_strategies.yml index f92e6c5b057..4a92695ec4e 100644 --- a/db/docs/operations_strategies.yml +++ b/db/docs/operations_strategies.yml @@ -7,4 +7,19 @@ feature_categories: description: https://docs.gitlab.com/ee/operations/feature_flags.html#feature-flag-strategies introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24819 milestone: '12.8' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +desired_sharding_key: + project_id: + references: projects + backfill_via: + parent: + foreign_key: feature_flag_id + table: operations_feature_flags + sharding_key: project_id + belongs_to: feature_flag diff --git a/db/docs/operations_strategies_user_lists.yml b/db/docs/operations_strategies_user_lists.yml index c4f0c42c5c5..e83ba150142 100644 --- a/db/docs/operations_strategies_user_lists.yml +++ b/db/docs/operations_strategies_user_lists.yml @@ -7,4 +7,19 @@ feature_categories: description: https://docs.gitlab.com/ee/operations/feature_flags.html#user-list introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30243 milestone: '13.0' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +desired_sharding_key: + project_id: + references: projects + backfill_via: + parent: + foreign_key: user_list_id + table: operations_user_lists + sharding_key: project_id + belongs_to: user_list diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 05f04cd1230..7f8d2dc4277 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -14677,22 +14677,12 @@ An AI agent. | Name | Type | Description | | ---- | ---- | ----------- | -| `_links` | [`AiAgentLinks!`](#aiagentlinks) | Map of links to perform actions on the agent. | | `createdAt` | [`Time!`](#time) | Date of creation. | | `id` | [`ID!`](#id) | ID of the agent. | | `name` | [`String!`](#string) | Name of the agent. | +| `routeId` | [`Int!`](#int) | Route ID of the agent. | | `versions` | [`[AiAgentVersion!]`](#aiagentversion) | Versions of the agent. | -### `AiAgentLinks` - -Represents links to perform actions on the agent. - -#### Fields - -| Name | Type | Description | -| ---- | ---- | ----------- | -| `showPath` | [`String`](#string) | Path to the details page of the agent. | - ### `AiAgentVersion` Version of an AI Agent. diff --git a/doc/development/ai_features/index.md b/doc/development/ai_features/index.md index 068eeba1847..622a6679342 100644 --- a/doc/development/ai_features/index.md +++ b/doc/development/ai_features/index.md @@ -126,7 +126,7 @@ used in specs. ``` 1. Run `gdk reconfigure` -1. Run database migrations to create the embedding database +1. Run database migrations to create the embedding database in the `gitlab` folder of the GDK ```shell RAILS_ENV=development bin/rails db:migrate diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md index 6a0cc83e813..5b1d991fdd0 100644 --- a/doc/integration/jira/configure.md +++ b/doc/integration/jira/configure.md @@ -67,7 +67,7 @@ To configure your project settings in GitLab: - For **Jira issue regex**, [enter a regex pattern](issues.md#define-a-regex-pattern). - For **Jira issue prefix**, [enter a prefix](issues.md#define-a-prefix). 1. Optional. In the **Issues** section: - - To [view issues](#view-jira-issues) from a single Jira project in a GitLab project: + - To [view Jira issues](#view-jira-issues) in GitLab: 1. Select the **Enable Jira issues** checkbox. 1. Enter the Jira project key. @@ -106,8 +106,7 @@ To view issues from a single Jira project in a GitLab project: By default, the issues are sorted by **Created date**. The most recently created issues appear at the top. -You can [search and filter the issue list](issues.md#search-and-filter-the-issue-list) -and select an issue to view that issue in GitLab. +You can [filter issues](#filter-jira-issues) and select an issue to view that issue in GitLab. Issues are grouped into the following tabs based on their [Jira status](https://confluence.atlassian.com/adminjiraserver070/defining-status-field-values-749382903.html): @@ -116,6 +115,31 @@ Issues are grouped into the following tabs based on their - **Closed**: issues with a **Done** Jira status. - **All**: issues with any Jira status. +### Filter Jira issues + +DETAILS: +**Tier:** Premium, Ultimate +**Offering:** SaaS, self-managed + +Prerequisites: + +- Ensure the Jira issue integration is [configured](#configure-the-integration) + and the **Enable Jira issues** checkbox is selected. + +When you [view Jira issues](#view-jira-issues) in GitLab, +you can filter the issues by text in summaries and descriptions. +You can also filter the issues by: + +- **Label**: specify one or more Jira issue labels in the `labels[]` parameter in the URL. + When you specify multiple labels, only the issues that have all the specified labels appear + (for example, `/-/integrations/jira/issues?labels[]=backend&labels[]=feature&labels[]=QA`). +- **Status**: specify the Jira issue status in the `status` parameter in the URL + (for example, `/-/integrations/jira/issues?status=In Progress`). +- **Reporter**: specify the Jira display name of the `author_username` parameter in the URL + (for example, `/-/integrations/jira/issues?author_username=John Smith`). +- **Assignee**: specify the Jira display name of the `assignee_username` parameter in the URL + (for example, `/-/integrations/jira/issues?assignee_username=John Smith`). + ## Create a Jira issue for a vulnerability DETAILS: diff --git a/doc/integration/jira/issues.md b/doc/integration/jira/issues.md index aa5a6a34ed5..aef07bfd1e3 100644 --- a/doc/integration/jira/issues.md +++ b/doc/integration/jira/issues.md @@ -146,29 +146,6 @@ Consider this example: - GitLab adds a formatted comment to Jira, linking back to the commit that resolved the issue. You can [disable comments](#disable-comments-on-jira-issues). -## Search and filter the issue list - -DETAILS: -**Tier:** Premium, Ultimate -**Offering:** SaaS, self-managed - -To refine the list of issues, use the search bar to search for any text -contained in an issue summary (title) or description. Use any combination -of these filters: - -- To filter issues by `labels`, specify one or more labels as part of the `labels[]` - parameter in the URL. When using multiple labels, only issues that contain all specified - labels are listed: `/-/integrations/jira/issues?labels[]=backend&labels[]=feature&labels[]=QA` -- To filter issues by `status`, specify the `status` parameter in the URL: - `/-/integrations/jira/issues?status=In Progress` -- To filter issues by `reporter`, specify a reporter's Jira display name for the - `author_username` parameter in the URL: `/-/integrations/jira/issues?author_username=John Smith` -- To filter issues by `assignee`, specify their Jira display name for the - `assignee_username` parameter in the URL: `/-/integrations/jira/issues?assignee_username=John Smith` - -Enhancements to use these filters through the user interface -[are planned](https://gitlab.com/groups/gitlab-org/-/epics/3622). - ## Automatic issue transitions When you configure automatic issue transitions, you can transition a referenced diff --git a/lib/gitlab/ci/build/rules/rule/clause/exists.rb b/lib/gitlab/ci/build/rules/rule/clause/exists.rb index c55615bb83b..1e3e50b94bc 100644 --- a/lib/gitlab/ci/build/rules/rule/clause/exists.rb +++ b/lib/gitlab/ci/build/rules/rule/clause/exists.rb @@ -8,25 +8,47 @@ module Gitlab # performed before the rule assumes that it has a match MAX_PATTERN_COMPARISONS = 10_000 + WILDCARD_NESTED_PATTERN = "**/*" + def initialize(globs) @globs = Array(globs) @top_level_only = @globs.all?(&method(:top_level_glob?)) end def satisfied_by?(_pipeline, context) - paths = worktree_paths(context) - exact_globs, pattern_globs = separate_globs(context) + if ::Feature.disabled?(:ci_rule_exists_extension_optimization, context.project, type: :gitlab_com_derisk) + return legacy_satisfied_by?(context) + end - exact_matches?(paths, exact_globs) || pattern_matches?(paths, pattern_globs) + paths = worktree_paths(context) + exact_globs, extension_globs, pattern_globs = separate_globs(context) + + exact_matches?(paths, exact_globs) || + matches_extension?(paths, extension_globs) || + pattern_matches?(paths, pattern_globs) end private - def separate_globs(context) + def legacy_satisfied_by?(context) + paths = worktree_paths(context) + exact_globs, pattern_globs = legacy_separate_globs(context) + + exact_matches?(paths, exact_globs) || pattern_matches?(paths, pattern_globs) + end + + def legacy_separate_globs(context) expanded_globs = expand_globs(context) expanded_globs.partition(&method(:exact_glob?)) end + def separate_globs(context) + expanded_globs = expand_globs(context) + + grouped = expanded_globs.group_by { |glob| glob_type(glob) } + grouped.values_at(:exact, :extension, :pattern).map { |globs| Array(globs) } + end + def expand_globs(context) @globs.map do |glob| ExpandVariables.expand_existing(glob, -> { context.variables_hash }) @@ -43,12 +65,32 @@ module Gitlab end end + def glob_type(glob) + if exact_glob?(glob) + :exact + elsif extension_glob?(glob) + :extension + else + :pattern + end + end + def exact_matches?(paths, exact_globs) exact_globs.any? do |glob| paths.bsearch { |path| glob <=> path } end end + def matches_extension?(paths, extension_globs) + return false if extension_globs.empty? + + extensions = extension_globs.map { |glob| without_wildcard_nested_pattern(glob) } + + paths.any? do |path| + path.end_with?(*extensions) + end + end + def pattern_matches?(paths, pattern_globs) comparisons = 0 @@ -73,6 +115,17 @@ module Gitlab def exact_glob?(glob) !glob.include?('*') && !glob.include?('?') && !glob.include?('[') && !glob.include?('{') end + + # matches glob patterns like **/*.js or **/*.so.1 to optimize with path.end_with?('.js') + def extension_glob?(glob) + without_nested = without_wildcard_nested_pattern(glob) + + without_nested.start_with?('.') && !without_nested.include?('/') && exact_glob?(without_nested) + end + + def without_wildcard_nested_pattern(glob) + glob.delete_prefix(WILDCARD_NESTED_PATTERN) + end end end end diff --git a/lib/gitlab/ci/components/instance_path.rb b/lib/gitlab/ci/components/instance_path.rb index 607eff902ea..6b718645ac3 100644 --- a/lib/gitlab/ci/components/instance_path.rb +++ b/lib/gitlab/ci/components/instance_path.rb @@ -48,43 +48,15 @@ module Gitlab attr_reader :version, :component_name def find_project_by_component_path(path) - if Feature.enabled?(:ci_redirect_component_project, Feature.current_request) - project_full_path = extract_project_path(path) + project_full_path = extract_project_path(path) - Project.find_by_full_path(project_full_path, follow_redirects: true).tap do |project| - next unless project + Project.find_by_full_path(project_full_path, follow_redirects: true).tap do |project| + next unless project - @component_name = extract_component_name(project_full_path) - end - else - legacy_finder(path).tap do |project| - next unless project - - @component_name = extract_component_name(project.full_path) - end + @component_name = extract_component_name(project_full_path) end end - def legacy_finder(path) - return if path.start_with?('/') # exit early if path starts with `/` or it will loop forever. - - possible_paths = [path] - - index = nil - - loop_until(limit: 20) do - index = path.rindex('/') # find index of last `/` in a path - break unless index - - possible_paths << (path = path[0..index - 1]) - end - - # remove shortest path as it is group - possible_paths.pop - - ::Project.where_full_path_in(possible_paths).take # rubocop: disable CodeReuse/ActiveRecord - end - # Given a path like "my-org/sub-group/the-project/the-component" # we expect that the last `/` is the separator between the project full path and the # component name. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8fc0a66279a..a54584ff1b2 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1931,9 +1931,6 @@ msgstr "" msgid "AIAgents|Create agent" msgstr "" -msgid "AIAgents|New AI Agent" -msgstr "" - msgid "AIAgents|New agent" msgstr "" @@ -4427,12 +4424,6 @@ msgstr "" msgid "Agent not found for provided id." msgstr "" -msgid "AiAgents|AI Agents" -msgstr "" - -msgid "AiAgents|AI agent" -msgstr "" - msgid "AiAgents|Agent Name" msgstr "" @@ -4442,9 +4433,6 @@ msgstr "" msgid "AiAgents|Create your own AI Agents" msgstr "" -msgid "AiAgents|Get started" -msgstr "" - msgid "Akismet" msgstr "" @@ -8197,9 +8185,6 @@ msgstr "" msgid "Billing|User was successfully removed" msgstr "" -msgid "Billing|View pending approvals" -msgstr "" - msgid "Billing|You are about to remove user %{username} from your subscription. If you continue, the user will be removed from the %{namespace} group and all its subgroups and projects. This action can't be undone." msgstr "" @@ -53815,6 +53800,9 @@ msgstr "" msgid "User cap cannot be enabled. The group or one of its subgroups or projects is shared externally." msgstr "" +msgid "User caps is enabled for this group, visit the %{pending_members_link_start}pending members%{pending_members_link_end} page to manage them." +msgstr "" + msgid "User created at" msgstr "" @@ -57214,11 +57202,6 @@ msgstr "" msgid "You don’t have access to Value Stream Analytics for this group" msgstr "" -msgid "You have %{pendingMembersCount} pending member that needs approval." -msgid_plural "You have %{pendingMembersCount} pending members that need approval." -msgstr[0] "" -msgstr[1] "" - msgid "You have already reported this user" msgstr "" diff --git a/package.json b/package.json index c7169fdc23c..dc6575ea553 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@cubejs-client/core": "^0.34.37", "@cubejs-client/vue": "^0.34.37", "@floating-ui/dom": "^1.2.9", - "@gitlab/application-sdk-browser": "^0.3.0", + "@gitlab/application-sdk-browser": "^0.3.1", "@gitlab/at.js": "1.5.7", "@gitlab/cluster-client": "^2.1.0", "@gitlab/favicon-overlay": "2.0.0", diff --git a/spec/features/explore/catalog/catalog_details_spec.rb b/spec/features/explore/catalog/catalog_details_spec.rb index 8def565ac01..0103b972e60 100644 --- a/spec/features/explore/catalog/catalog_details_spec.rb +++ b/spec/features/explore/catalog/catalog_details_spec.rb @@ -21,10 +21,10 @@ RSpec.describe 'CI/CD Catalog details page', :js, feature_category: :pipeline_co end context 'when the resource is not published' do - let(:draft_catalog_resource) { create(:ci_catalog_resource, project: project, state: :draft) } + let(:unpublished_catalog_resource) { create(:ci_catalog_resource, project: project, state: :unpublished) } before do - visit explore_catalog_path(draft_catalog_resource) + visit explore_catalog_path(unpublished_catalog_resource) end it 'returns a 404' do diff --git a/spec/frontend/commit/components/commit_box_pipeline_status_spec.js b/spec/frontend/commit/components/commit_box_pipeline_status_spec.js index 37ce234c61c..08ed5e47e43 100644 --- a/spec/frontend/commit/components/commit_box_pipeline_status_spec.js +++ b/spec/frontend/commit/components/commit_box_pipeline_status_spec.js @@ -95,11 +95,17 @@ describe('Commit box pipeline status', () => { }); describe('error state', () => { - it('createAlert should show if there is an error fetching the pipeline status', async () => { + beforeEach(async () => { createComponent(failedHandler); await waitForPromises(); + }); + it('does not show pipeline status', () => { + expect(findCiIcon().exists()).toBe(false); + }); + + it('createAlert should show if there is an error fetching the pipeline status', () => { expect(createAlert).toHaveBeenCalledWith({ message: PIPELINE_STATUS_FETCH_ERROR, }); diff --git a/spec/frontend/commit/mock_data.js b/spec/frontend/commit/mock_data.js index 2a618e08c50..336729684c8 100644 --- a/spec/frontend/commit/mock_data.js +++ b/spec/frontend/commit/mock_data.js @@ -142,9 +142,9 @@ export const mockPipelineStatusResponse = { id: 'gid://gitlab/Ci::Pipeline/320', detailedStatus: { id: 'pending-320-320', - detailsPath: '/root/ci-project/-/pipelines/320', icon: 'status_pending', - group: 'pending', + text: 'Pending', + detailsPath: '/root/ci-project/-/pipelines/320', __typename: 'DetailedStatus', }, __typename: 'Pipeline', diff --git a/spec/frontend/diff_spec.js b/spec/frontend/diff_spec.js index 759ae32ac51..3eb22a65c4c 100644 --- a/spec/frontend/diff_spec.js +++ b/spec/frontend/diff_spec.js @@ -35,14 +35,14 @@ describe('Diff', () => { const jsonPath = 'http://test.host/path/somewhere.json?params=exist'; const simulatejQueryClick = { originalEvent: { - target: { - getAttribute() { - return clickPath; - }, - }, preventDefault: jest.fn(), stopPropagation: jest.fn(), }, + currentTarget: { + getAttribute() { + return clickPath; + }, + }, }; it('emits the correct switch view event when called and there is an `mrHub`', async () => { diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index a6db9e77c61..0508b4674d7 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -195,6 +195,30 @@ RSpec.describe DiffHelper, feature_category: :code_review_workflow do end end + describe '#parallel_diff_btn' do + let(:params) do + ActionController::Parameters.new({ + controller: "projects/commit", + action: "show", + namespace_id: "foo", + project_id: "bar", + id: commit.sha, + view: 'parallel' + }).permit! + end + + before do + allow(helper).to receive(:params).and_return(params) + end + + subject(:diff_btn) { helper.parallel_diff_btn } + + it 'renders button' do + expect(diff_btn).to include('Side-by-side') + expect(diff_btn).to include('gl-button btn btn-md btn-default selected') + end + end + describe "#mark_inline_diffs" do let(:old_line) { %(abc 'def') } let(:new_line) { %(abc "def") } diff --git a/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb b/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb index 647653f8e9e..7c2510744a8 100644 --- a/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb +++ b/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Gitlab::Ci::Build::Rules::Rule::Clause::Exists do +RSpec.describe Gitlab::Ci::Build::Rules::Rule::Clause::Exists, feature_category: :pipeline_composition do describe '#satisfied_by?' do subject(:satisfied_by?) { described_class.new(globs).satisfied_by?(nil, context) } @@ -11,6 +11,16 @@ RSpec.describe Gitlab::Ci::Build::Rules::Rule::Clause::Exists do let(:project) { create(:project, :custom_repo, files: files) } end + context 'with feature flag `ci_rule_exists_extension_optimization` disabled' do + before do + stub_feature_flags(ci_rule_exists_extension_optimization: false) + end + + it_behaves_like 'a glob matching rule' do + let(:project) { create(:project, :custom_repo, files: files) } + end + end + context 'when the rules:exists has a variable' do let_it_be(:project) { create(:project, :custom_repo, files: { 'helm/helm_file.txt' => '' }) } diff --git a/spec/lib/gitlab/ci/components/instance_path_spec.rb b/spec/lib/gitlab/ci/components/instance_path_spec.rb index b9b4c3f7c69..366f71f2a42 100644 --- a/spec/lib/gitlab/ci/components/instance_path_spec.rb +++ b/spec/lib/gitlab/ci/components/instance_path_spec.rb @@ -63,27 +63,11 @@ RSpec.describe Gitlab::Ci::Components::InstancePath, feature_category: :pipeline it_behaves_like 'fetches the component content' - context 'when feature flag ci_redirect_component_project is disabled' do - before do - stub_feature_flags(ci_redirect_component_project: false) - end - - it_behaves_like 'fetches the component content' - end - context 'when the there is a redirect set for the project' do let!(:redirect_route) { project.redirect_routes.create!(path: 'another-group/new-project') } let(:project_path) { redirect_route.path } it_behaves_like 'fetches the component content' - - context 'when feature flag ci_redirect_component_project is disabled' do - before do - stub_feature_flags(ci_redirect_component_project: false) - end - - it_behaves_like 'does not find the component' - end end end @@ -121,21 +105,6 @@ RSpec.describe Gitlab::Ci::Components::InstancePath, feature_category: :pipeline it_behaves_like 'does not find the component' end - # TODO: remove when deleting the feature flag `ci_redirect_component_project` - shared_examples 'prevents infinite loop' do |prefix| - context "when the project path starts with '#{prefix}'" do - let(:project_path) { "#{prefix}#{project.full_path}" } - - it 'returns nil' do - result = path.fetch_content!(current_user: user) - expect(result).to be_nil - end - end - end - - it_behaves_like 'prevents infinite loop', '/' - it_behaves_like 'prevents infinite loop', '//' - context 'when fetching the latest version of a component' do let_it_be(:project) do create( diff --git a/spec/models/ci/catalog/listing_spec.rb b/spec/models/ci/catalog/listing_spec.rb index 8092fa5371c..b5aa6bf32fc 100644 --- a/spec/models/ci/catalog/listing_spec.rb +++ b/spec/models/ci/catalog/listing_spec.rb @@ -161,7 +161,9 @@ RSpec.describe Ci::Catalog::Listing, feature_category: :pipeline_composition do describe '#find_resource' do let_it_be(:accessible_resource) { create(:ci_catalog_resource, :published, project: public_project) } let_it_be(:inaccessible_resource) { create(:ci_catalog_resource, :published, project: project_noaccess) } - let_it_be(:draft_resource) { create(:ci_catalog_resource, project: public_namespace_project, state: :draft) } + let_it_be(:unpublished_resource) do + create(:ci_catalog_resource, project: public_namespace_project, state: :unpublished) + end context 'when using the ID argument' do subject { list.find_resource(id: id) } @@ -183,7 +185,7 @@ RSpec.describe Ci::Catalog::Listing, feature_category: :pipeline_composition do end context 'when the resource is not published' do - let(:id) { draft_resource.id } + let(:id) { unpublished_resource.id } it 'returns nil' do is_expected.to be_nil @@ -219,7 +221,7 @@ RSpec.describe Ci::Catalog::Listing, feature_category: :pipeline_composition do end context 'when the resource is not published' do - let(:full_path) { draft_resource.project.full_path } + let(:full_path) { unpublished_resource.project.full_path } it 'returns nil' do is_expected.to be_nil diff --git a/spec/models/ci/catalog/resource_spec.rb b/spec/models/ci/catalog/resource_spec.rb index 70adfddec15..674d6476a61 100644 --- a/spec/models/ci/catalog/resource_spec.rb +++ b/spec/models/ci/catalog/resource_spec.rb @@ -39,7 +39,7 @@ RSpec.describe Ci::Catalog::Resource, feature_category: :pipeline_composition do it { is_expected.to delegate_method(:avatar_path).to(:project) } it { is_expected.to delegate_method(:star_count).to(:project) } - it { is_expected.to define_enum_for(:state).with_values({ draft: 0, published: 1 }) } + it { is_expected.to define_enum_for(:state).with_values({ unpublished: 0, published: 1 }) } it do is_expected.to define_enum_for(:verification_level) @@ -199,15 +199,15 @@ RSpec.describe Ci::Catalog::Resource, feature_category: :pipeline_composition do end describe '#state' do - it 'defaults to draft' do - expect(resource_a.state).to eq('draft') + it 'defaults to unpublished' do + expect(resource_a.state).to eq('unpublished') end end describe '#publish!' do - context 'when the catalog resource is in draft state' do + context 'when the catalog resource is in an unpublished state' do it 'updates the state of the catalog resource to published' do - expect(resource_a.state).to eq('draft') + expect(resource_a.state).to eq('unpublished') resource_a.publish! diff --git a/spec/requests/explore/catalog_controller_spec.rb b/spec/requests/explore/catalog_controller_spec.rb index 59a5dcffd3c..f6d15b8aa72 100644 --- a/spec/requests/explore/catalog_controller_spec.rb +++ b/spec/requests/explore/catalog_controller_spec.rb @@ -36,11 +36,11 @@ RSpec.describe Explore::CatalogController, feature_category: :pipeline_compositi it_behaves_like 'basic get requests', :show - context 'when rendering a draft catalog resource' do + context 'when rendering an unpublished catalog resource' do it 'returns not found error' do - draft_catalog_resource = create(:ci_catalog_resource, state: :draft) + unpublished_catalog_resource = create(:ci_catalog_resource, state: :unpublished) - get explore_catalog_path(draft_catalog_resource) + get explore_catalog_path(unpublished_catalog_resource) expect(response).to have_gitlab_http_status(:not_found) end diff --git a/spec/services/releases/destroy_service_spec.rb b/spec/services/releases/destroy_service_spec.rb index b7729043896..0c87a9fd918 100644 --- a/spec/services/releases/destroy_service_spec.rb +++ b/spec/services/releases/destroy_service_spec.rb @@ -34,7 +34,7 @@ RSpec.describe Releases::DestroyService, feature_category: :release_orchestratio let!(:version) { create(:ci_catalog_resource_version, catalog_resource: catalog_resource, release: release) } it 'does not update the catalog resources if there are still releases' do - second_release = create(:release, project: project, tag: 'v1.2.0') + second_release = create(:release, project: project, tag: '1.2.0') create(:ci_catalog_resource_version, catalog_resource: catalog_resource, release: second_release) subject @@ -45,7 +45,7 @@ RSpec.describe Releases::DestroyService, feature_category: :release_orchestratio it 'updates the catalog resource if there are no more releases' do subject - expect(catalog_resource.reload.state).to eq('draft') + expect(catalog_resource.reload.state).to eq('unpublished') end end end diff --git a/spec/support/shared_examples/lib/gitlab/ci/build/rules/rule/clause/clause_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/ci/build/rules/rule/clause/clause_shared_examples.rb index 1934fd584f3..5cf53b81be7 100644 --- a/spec/support/shared_examples/lib/gitlab/ci/build/rules/rule/clause/clause_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/ci/build/rules/rule/clause/clause_shared_examples.rb @@ -13,8 +13,15 @@ RSpec.shared_examples 'a glob matching rule' do 'pattern nested match' | ['src/**/*.go'] | { 'src/gitlab.com/goproject/goproject.go' => '' } | true 'pattern nested no match' | ['src/**/*.go'] | { 'src/gitlab.com/goproject/README.md' => '' } | false 'ext top-level match' | ['*.go'] | { 'main.go' => '', 'cmd/goproject/main.go' => '' } | true + 'multi ext nested match' | ['**/*.so.1'] | { 'lib/lib64/lib.so.1' => '' } | true 'ext nested no match' | ['*.go'] | { 'cmd/goproject/main.go' => '' } | false 'ext slash no match' | ['/*.go'] | { 'main.go' => '', 'cmd/goproject/main.go' => '' } | false + 'dir with dot match' | ['**/*.xcodeproj/*'] | { 'a.xcodeproj/x.pbxproj' => '' } | true + 'dir with dot no match' | ['**/*.xcodeproj/*'] | { 'main/x.pbxproj' => '' } | false + 'top dir with dot match' | ['*.xcodeproj/*'] | { 'a.xcodeproj/x.pbxproj' => '' } | true + 'top dir with dot no match' | ['*.xcodeproj/*'] | { 'main/x.pbxproj' => '' } | false + 'ext with glob match 1' | ['**/*.y*ml'] | { 'hello/world.yml' => '' } | true + 'ext with glob match 2' | ['**/*.y*ml'] | { 'hello/world.yaml' => '' } | true end with_them do diff --git a/vendor/assets/javascripts/jquery.endless-scroll.js b/vendor/assets/javascripts/jquery.endless-scroll.js index fe0fe5b5a8e..eb5d53ac208 100644 --- a/vendor/assets/javascripts/jquery.endless-scroll.js +++ b/vendor/assets/javascripts/jquery.endless-scroll.js @@ -62,6 +62,7 @@ }; var options = $.extend({}, defaults, options), + data = false, firing = true, fired = false, fireSequence = 0, diff --git a/yarn.lock b/yarn.lock index 67c91a6f4b8..aeeb4ed000e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1258,10 +1258,10 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== -"@gitlab/application-sdk-browser@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@gitlab/application-sdk-browser/-/application-sdk-browser-0.3.0.tgz#6f1a2e6480bbc830e33bde35406ad45b12215b7a" - integrity sha512-nhJs/4Ccqb/v3gONKb4hExyFrzaA1YB1JHXf63n5TOG3Q6piUOaWWR6nUwQM6j/gmc+OqHinw0sX38twtYycXg== +"@gitlab/application-sdk-browser@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@gitlab/application-sdk-browser/-/application-sdk-browser-0.3.1.tgz#1eaf8838c48417223bcecbb19bf262c6c6d88d8e" + integrity sha512-I7IDm5yvVDAqi9/GlOfDSJBpxrAoJxs0A8dHQNIXZ+y5r66i259cW+laWfDiq40td/SFNjONjVs0PWBflkuoSQ== dependencies: "@snowplow/browser-plugin-client-hints" "^3.9.0" "@snowplow/browser-plugin-error-tracking" "^3.9.0"