diff options
Diffstat (limited to 'config')
237 files changed, 1873 insertions, 542 deletions
diff --git a/config/application.rb b/config/application.rb index 249db9c6a67..a3fe4935fdf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -284,6 +284,8 @@ module Gitlab config.assets.precompile << "page_bundles/incident_management_list.css" config.assets.precompile << "page_bundles/incidents.css" config.assets.precompile << "page_bundles/issues_analytics.css" + config.assets.precompile << "page_bundles/issuable.css" + config.assets.precompile << "page_bundles/issuable_list.css" config.assets.precompile << "page_bundles/issues_list.css" config.assets.precompile << "page_bundles/issues_show.css" config.assets.precompile << "page_bundles/jira_connect.css" @@ -316,13 +318,16 @@ module Gitlab config.assets.precompile << "page_bundles/roadmap.css" config.assets.precompile << "page_bundles/requirements.css" config.assets.precompile << "page_bundles/runner_details.css" + config.assets.precompile << "page_bundles/search.css" config.assets.precompile << "page_bundles/security_dashboard.css" config.assets.precompile << "page_bundles/security_discover.css" + config.assets.precompile << "page_bundles/settings.css" config.assets.precompile << "page_bundles/signup.css" config.assets.precompile << "page_bundles/terminal.css" config.assets.precompile << "page_bundles/terms.css" config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/tree.css" + config.assets.precompile << "page_bundles/users.css" config.assets.precompile << "page_bundles/wiki.css" config.assets.precompile << "page_bundles/work_items.css" config.assets.precompile << "page_bundles/xterm.css" @@ -333,6 +338,7 @@ module Gitlab config.assets.precompile << "disable_animations.css" config.assets.precompile << "test_environment.css" config.assets.precompile << "snippets.css" + config.assets.precompile << "fonts.css" config.assets.precompile << "locale/**/app.js" config.assets.precompile << "emoji_sprites.css" config.assets.precompile << "errors.css" @@ -344,6 +350,11 @@ module Gitlab config.assets.precompile << "highlight/diff_custom_colors_addition.css" config.assets.precompile << "highlight/diff_custom_colors_deletion.css" + # Import woff2 for fonts + config.assets.paths << "#{config.root}/node_modules/@gitlab/fonts/" + config.assets.precompile << "gitlab-sans/*.woff2" + config.assets.precompile << "jetbrains-mono/*.woff2" + # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.paths << "#{config.root}/node_modules/@jihulab/svgs/dist" if Gitlab.jh? @@ -417,6 +428,21 @@ module Gitlab expose: headers_to_expose end + allow do + origins { |source, env| source == Gitlab::CurrentSettings.jira_connect_proxy_url } + resource '/-/jira_connect/oauth_application_id', headers: :any, credentials: false, methods: %i(get options) + end + + allow do + origins { |source, env| source == Gitlab::CurrentSettings.jira_connect_proxy_url } + resource '/-/jira_connect/subscriptions.json', headers: :any, credentials: false, methods: %i(get options) + end + + allow do + origins { |source, env| source == Gitlab::CurrentSettings.jira_connect_proxy_url } + resource '/-/jira_connect/subscriptions/*', headers: :any, credentials: false, methods: %i(delete options) + end + # Cross-origin requests must be enabled for the Authorization code with PKCE OAuth flow when used from a browser. %w(/oauth/token /oauth/revoke).each do |oauth_path| allow do diff --git a/config/audit_events/types/policy_project_updated.yml b/config/audit_events/types/policy_project_updated.yml deleted file mode 100644 index 6fffc7f6b10..00000000000 --- a/config/audit_events/types/policy_project_updated.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: policy_project_updated -description: "This event is triggered whenever the security policy project is updated for a project." -introduced_by_issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/377877" -introduced_by_mr: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102154" -milestone: "15.6" -group: "govern::security policies" -saved_to_database: true -streamed: false diff --git a/config/audit_events/types/type_schema.json b/config/audit_events/types/type_schema.json index 0d5d79bc4c4..3921b36ba91 100644 --- a/config/audit_events/types/type_schema.json +++ b/config/audit_events/types/type_schema.json @@ -28,9 +28,9 @@ "https" ] }, - "group": { + "feature_category": { "type": "string", - "description": "Name of the group that introduced this audit event. For example, manage::compliance" + "description": "The feature category of this audit event. For example, compliance_management" }, "milestone": { "type": "string", @@ -48,7 +48,7 @@ }, "required": [ "description", - "group", + "feature_category", "introduced_by_issue", "introduced_by_mr", "milestone", diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index c3d9179a160..9afa2b6fca3 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -245,13 +245,13 @@ - unicode_utils - MIT - :who: Aishwarya Subramanain - :why: https://github.com/hexorx/countries/blob/master/LICENSE + :why: https://github.com/countries/countries/blob/master/LICENSE :versions: [] :when: 2019-09-11 13:08:28.431132000 Z - - :permit - "(MIT OR CC0-1.0)" - - :who: - :why: + - :who: + :why: :versions: [] :when: 2019-11-08 10:03:31.787226000 Z - - :permit @@ -369,3 +369,15 @@ :why: https://github.com/gridstack/gridstack.js/blob/v7.0.0/LICENSE :versions: [] :when: 2022-10-18 16:24:56.611523399 Z +- - :approve + - "@gitlab/fonts" + - :who: Lukas Eipert + :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/1265 + :versions: [] + :when: 2022-12-02 08:24:56.611523399 Z +- - :approve + - llhttp-ffi + - :who: Hunter Stewart + :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/1293 + :versions: [] + :when: 2022-12-09 20:28:33.507704000 Z diff --git a/config/environments/development.rb b/config/environments/development.rb index 8f266f2660c..71376b74cfa 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -74,6 +74,10 @@ Rails.application.configure do # Do not log asset requests config.assets.quiet = true + # Use 'listen' gem to watch for file changes and improve performance + # See: https://guides.rubyonrails.org/configuring.html#config-file-watcher + config.file_watcher = ActiveSupport::EventedFileUpdateChecker + # BetterErrors live shell (REPL) on every stack frame BetterErrors::Middleware.allow_ip!("127.0.0.1/0") diff --git a/config/events/1651053267_event_create_service_action_active_users_project_repo.yml b/config/events/1651053267_event_create_service_project_action.yml index bab5dd9e7b3..a800c5f3fdf 100644 --- a/config/events/1651053267_event_create_service_action_active_users_project_repo.yml +++ b/config/events/1651053267_event_create_service_project_action.yml @@ -1,7 +1,7 @@ --- description: Perform Git operation (read/write/push) category: EventCreateService -action: action_active_users_project_repo +action: project_action label_description: property_description: value_description: @@ -16,7 +16,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83795 distributions: - ce - ee -tiers: +tiers: - free - premium - ultimate diff --git a/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml b/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml deleted file mode 100644 index 128bfaf6029..00000000000 --- a/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -description: Triggered from backend on editing file in web ide -category: ide_edit -action: g_edit_by_web_ide -identifiers: -- project -- user -- namespace -product_section: dev -product_stage: create -product_group: group::editor -product_category: web_ide -milestone: "15.1" -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 -distributions: -- ce -- ee -tiers: -- free -- premium -- ultimate - diff --git a/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml b/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml deleted file mode 100644 index d9d54e1c311..00000000000 --- a/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -description: Triggered from backend on showing a file in live preview -category: ide_edit -action: g_edit_by_live_preview -identifiers: - - project - - user - - namespace -product_section: dev -product_stage: create -product_group: group::editor -product_category: web_ide -milestone: "15.1" -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 -distributions: - - ce - - ee -tiers: - - free - - premium - - ultimate - diff --git a/config/events/1656690716_post_receive_source_code_pushes.yml b/config/events/1656690716_post_receive_source_code_pushes.yml deleted file mode 100644 index d0c9fa35d09..00000000000 --- a/config/events/1656690716_post_receive_source_code_pushes.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -description: All events of Git push operations -category: PostReceive -action: source_code_pushes -label_description: -property_description: -value_description: -extra_properties: -identifiers: -- project -- user -- namespace -product_section: dev -product_stage: create -product_group: source_code -product_category: source_code_management -milestone: "15.2" -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91605 -distributions: -- ce -- ee -tiers: -- free -- premium -- ultimate - diff --git a/config/events/1669277827_API__Commits_commit.yml b/config/events/1669277827_API__Commits_commit.yml new file mode 100644 index 00000000000..db95a997100 --- /dev/null +++ b/config/events/1669277827_API__Commits_commit.yml @@ -0,0 +1,26 @@ +--- +description: Mirrored Service Ping Redis metric counts.web_ide_commits - Count of commits made from the Web IDE +category: API::Commits +action: commit +label_description: key_path of Service Ping metric counts.web_ide_commits +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: dev +product_stage: create +product_group: editor +product_category: web_ide +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104947 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1655726650_ide_edit_g_edit_by_sfe.yml b/config/events/1669597397_Gitlab__UsageDataCounters__EditorUniqueCounter_ide_edit.yml index 9acdc317cf5..67240ae2363 100644 --- a/config/events/1655726650_ide_edit_g_edit_by_sfe.yml +++ b/config/events/1669597397_Gitlab__UsageDataCounters__EditorUniqueCounter_ide_edit.yml @@ -1,7 +1,7 @@ --- -description: Triggered from backend on editing file by sfe -category: ide_edit -action: g_edit_by_sfe +description: Triggered from backend on interaction with web ide +category: Gitlab::UsageDataCounters::EditorUniqueCounter +action: ide_edit identifiers: - project - user @@ -10,8 +10,8 @@ product_section: dev product_stage: create product_group: group::editor product_category: web_ide -milestone: "15.1" -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104809 distributions: - ce - ee @@ -19,4 +19,3 @@ tiers: - free - premium - ultimate - diff --git a/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml b/config/events/1669605315_PostReceive_push.yml index 2b3ed1a5d7a..da79e7531cf 100644 --- a/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml +++ b/config/events/1669605315_PostReceive_push.yml @@ -1,17 +1,17 @@ --- -description: Triggered from backend on editing file by ide snippet -category: ide_edit -action: g_edit_by_snippet_ide +description: Mirrored Redis source_code_pushes events sent to Snowplow +category: PostReceive +action: push identifiers: - project - user - namespace product_section: dev product_stage: create -product_group: group::editor -product_category: web_ide -milestone: "15.1" -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 +product_group: source_code +product_category: source_code_management +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104670 distributions: - ce - ee @@ -19,4 +19,3 @@ tiers: - free - premium - ultimate - diff --git a/config/events/1669605645_Gitlab__UsageDataCounters__MergeRequestActivityUniqueCounter_approve.yml b/config/events/1669605645_Gitlab__UsageDataCounters__MergeRequestActivityUniqueCounter_approve.yml new file mode 100644 index 00000000000..a4960120659 --- /dev/null +++ b/config/events/1669605645_Gitlab__UsageDataCounters__MergeRequestActivityUniqueCounter_approve.yml @@ -0,0 +1,22 @@ +--- +description: Mirrored RedisHLL i_code_review_user_approve_mr_monthly events sent to Snowplow +category: Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter +action: approve +identifiers: + - project + - user + - namespace +product_stage: create +product_group: code_review +product_category: code_review +product_section: 'TBD' +milestone: "15.7" +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104670" +distributions: + - ce + - ee +tiers: + - free + - premium + - ultimate + diff --git a/config/events/1669814629_StatusPage__PublishService_incident_management_incident_published.yml b/config/events/1669814629_StatusPage__PublishService_incident_management_incident_published.yml new file mode 100644 index 00000000000..9e6f699786b --- /dev/null +++ b/config/events/1669814629_StatusPage__PublishService_incident_management_incident_published.yml @@ -0,0 +1,24 @@ +--- +description: Mirrored Service Ping Redis metric. Count of unique users that published incidents per month +category: StatusPage::PublishService +action: incident_management_incident_published +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ee +tiers: +- premium +- ultimate + diff --git a/config/events/1669815074_Mutations__AlertManagement__Alerts__Todo__Create_incident_management_alert_todo.yml b/config/events/1669815074_Mutations__AlertManagement__Alerts__Todo__Create_incident_management_alert_todo.yml new file mode 100644 index 00000000000..f94db886c51 --- /dev/null +++ b/config/events/1669815074_Mutations__AlertManagement__Alerts__Todo__Create_incident_management_alert_todo.yml @@ -0,0 +1,26 @@ +--- +description: Migrated Service Ping metric. Count of unique users adding alerts to the TODO list +category: Mutations::AlertManagement::Alerts::Todo::Create +action: incident_management_alert_todo +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223/diffs +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669817378_Mutations__AlertManagement__Alerts__SetAssignees_incident_management_alert_assigned.yml b/config/events/1669817378_Mutations__AlertManagement__Alerts__SetAssignees_incident_management_alert_assigned.yml new file mode 100644 index 00000000000..4b2c786149f --- /dev/null +++ b/config/events/1669817378_Mutations__AlertManagement__Alerts__SetAssignees_incident_management_alert_assigned.yml @@ -0,0 +1,26 @@ +--- +description: Count of unique users assigning an alert per week. Migrated form Service Ping metric +category: Mutations::AlertManagement::Alerts::SetAssignees +action: incident_management_alert_assigned +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669817630_Mutations__AlertManagement__CreateAlertIssue_incident_management_incident_created.yml b/config/events/1669817630_Mutations__AlertManagement__CreateAlertIssue_incident_management_incident_created.yml new file mode 100644 index 00000000000..28bd7ba89c6 --- /dev/null +++ b/config/events/1669817630_Mutations__AlertManagement__CreateAlertIssue_incident_management_incident_created.yml @@ -0,0 +1,26 @@ +--- +description: Migrated from Service Ping metric. Count of unique users creating incidents +category: Mutations::AlertManagement::CreateAlertIssue +action: incident_management_incident_created +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669817815_Mutations__AlertManagement__UpdateAlertStatus_incident_management_alert_status_change.yml b/config/events/1669817815_Mutations__AlertManagement__UpdateAlertStatus_incident_management_alert_status_change.yml new file mode 100644 index 00000000000..409d1186348 --- /dev/null +++ b/config/events/1669817815_Mutations__AlertManagement__UpdateAlertStatus_incident_management_alert_status_change.yml @@ -0,0 +1,26 @@ +--- +description: Count of unique users changing alert's status. Migrated from Service Ping metric +category: Mutations::AlertManagement::UpdateAlertStatus +action: incident_management_alert_status_changed +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669818009_IncidentManagement__TimelineEvents__CreateService_incident_management_timeline_event_.yml b/config/events/1669818009_IncidentManagement__TimelineEvents__CreateService_incident_management_timeline_event_.yml new file mode 100644 index 00000000000..b3033c4aa3b --- /dev/null +++ b/config/events/1669818009_IncidentManagement__TimelineEvents__CreateService_incident_management_timeline_event_.yml @@ -0,0 +1,27 @@ +--- +description: Count of unique users created timeline events +category: IncidentManagement::TimelineEvents::CreateService +action: incident_management_timeline_event_created +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: respond +product_category: incident_management +value_type: number +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669902189_IncidentManagement__TimelineEvents__DestroyService_incident_management_timeline_event.yml b/config/events/1669902189_IncidentManagement__TimelineEvents__DestroyService_incident_management_timeline_event.yml new file mode 100644 index 00000000000..a314f3c7b8e --- /dev/null +++ b/config/events/1669902189_IncidentManagement__TimelineEvents__DestroyService_incident_management_timeline_event.yml @@ -0,0 +1,26 @@ +--- +category: IncidentManagement::TimelineEvents::DestroyService +action: incident_management_timeline_event_deleted +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Event migrates from Service Ping metric. Count of unique users deleted timeline events" +product_section: ops +product_stage: monitor +product_group: respond +product_category: incident_management +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669902383_IncidentManagement__TimelineEvents__UpdateService_incident_management_timeline_event_.yml b/config/events/1669902383_IncidentManagement__TimelineEvents__UpdateService_incident_management_timeline_event_.yml new file mode 100644 index 00000000000..afab1a0f531 --- /dev/null +++ b/config/events/1669902383_IncidentManagement__TimelineEvents__UpdateService_incident_management_timeline_event_.yml @@ -0,0 +1,26 @@ +--- +category: IncidentManagement::TimelineEvents::UpdateService +action: incident_management_timeline_event_edited +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Event migrated form Service Ping metric. Count of unique users edited timeline events" +product_section: ops +product_stage: monitor +product_group: respond +product_category: incident_management +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669902538_IssueLinks__CreateService_incident_management_incident_relate.yml b/config/events/1669902538_IssueLinks__CreateService_incident_management_incident_relate.yml new file mode 100644 index 00000000000..00ac7581617 --- /dev/null +++ b/config/events/1669902538_IssueLinks__CreateService_incident_management_incident_relate.yml @@ -0,0 +1,26 @@ +--- +category: IssueLinks::CreateService +action: incident_management_incident_relate +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of unique users adding issues per that are related to an incident. Migrated from Service Ping" +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669902705_IssueLinks__DestroyService_incident_management_incident_unrelate.yml b/config/events/1669902705_IssueLinks__DestroyService_incident_management_incident_unrelate.yml new file mode 100644 index 00000000000..4870e2b1f04 --- /dev/null +++ b/config/events/1669902705_IssueLinks__DestroyService_incident_management_incident_unrelate.yml @@ -0,0 +1,26 @@ +--- +category: IssueLinks::DestroyService +action: incident_management_incident_unrelate +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +milestone: "15.7" +description: "Count of unique users removing issue that are related to an incident. Migrated from Service Ping metric" +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669902889_Issues__CloseService_incident_management_incident_closed.yml b/config/events/1669902889_Issues__CloseService_incident_management_incident_closed.yml new file mode 100644 index 00000000000..8e6f54876b2 --- /dev/null +++ b/config/events/1669902889_Issues__CloseService_incident_management_incident_closed.yml @@ -0,0 +1,26 @@ +--- +category: Issues::CloseService +action: incident_management_incident_closed +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of users closing incidents. Migrated from Service Ping metric." +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669903092_Issues__ReopenService_incident_management_incident_reopened.yml b/config/events/1669903092_Issues__ReopenService_incident_management_incident_reopened.yml new file mode 100644 index 00000000000..33118e11051 --- /dev/null +++ b/config/events/1669903092_Issues__ReopenService_incident_management_incident_reopened.yml @@ -0,0 +1,26 @@ +--- +category: Issues::ReopenService +action: incident_management_incident_reopened +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of unique users reopening incidents. Migrated from Service Ping metric." +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669903273_Issues__UpdateService_incident_management_incident_change_confidential.yml b/config/events/1669903273_Issues__UpdateService_incident_management_incident_change_confidential.yml new file mode 100644 index 00000000000..2992667da31 --- /dev/null +++ b/config/events/1669903273_Issues__UpdateService_incident_management_incident_change_confidential.yml @@ -0,0 +1,26 @@ +--- +category: Issues::UpdateService +action: incident_management_incident_change_confidential +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of unique users changing incidents to confidential. Event migrated from Service Ping metric." +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669903414_Issues__ZoomLinkService_incident_management_incident_zoom_meeting.yml b/config/events/1669903414_Issues__ZoomLinkService_incident_management_incident_zoom_meeting.yml new file mode 100644 index 00000000000..5dc7506bc21 --- /dev/null +++ b/config/events/1669903414_Issues__ZoomLinkService_incident_management_incident_zoom_meeting.yml @@ -0,0 +1,26 @@ +--- +category: Issues::ZoomLinkService +action: incident_management_incident_zoom_meeting +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of unique users creating Zoom meetings about incidents. Event migrated from Service Ping metric." +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669903530_Notes__CreateService_incident_management_incident_comment.yml b/config/events/1669903530_Notes__CreateService_incident_management_incident_comment.yml new file mode 100644 index 00000000000..f7b619e3277 --- /dev/null +++ b/config/events/1669903530_Notes__CreateService_incident_management_incident_comment.yml @@ -0,0 +1,26 @@ +--- +category: Notes::CreateService +action: incident_management_incident_comment +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of unique users adding comments on incidents. Event migrated from Service Ping metric" +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1669903650_TodoService_incident_management_incident_todo.yml b/config/events/1669903650_TodoService_incident_management_incident_todo.yml new file mode 100644 index 00000000000..b8eee5ce23e --- /dev/null +++ b/config/events/1669903650_TodoService_incident_management_incident_todo.yml @@ -0,0 +1,26 @@ +--- +category: TodoService +action: incident_management_incident_todo +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +description: "Count of unique users adding incidents to the TODO list. Event migrated from Service Ping metric" +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1670570965_Issues__UpdateService_incident_management_incident_assigned.yml b/config/events/1670570965_Issues__UpdateService_incident_management_incident_assigned.yml new file mode 100644 index 00000000000..22c1a41127b --- /dev/null +++ b/config/events/1670570965_Issues__UpdateService_incident_management_incident_assigned.yml @@ -0,0 +1,26 @@ +--- +description: Count of unique users assiging incidents per +category: Issues::UpdateService +action: incident_management_incident_assigned +label_description: "Mirrored Service Ping total metric key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly" +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: ops +product_stage: monitor +product_group: monitor +product_category: +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105223 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1656510012_merge_requests_i_code_review_user_approve_mr.yml b/config/events/1671198983_Gitlab__UsageDataCounters__MergeRequestActivityUniqueCounter_create.yml index 10ebf12253f..9c1b389b4b2 100644 --- a/config/events/1656510012_merge_requests_i_code_review_user_approve_mr.yml +++ b/config/events/1671198983_Gitlab__UsageDataCounters__MergeRequestActivityUniqueCounter_create.yml @@ -1,7 +1,8 @@ --- -description: Merge request approvals -category: merge_requests -action: i_code_review_user_approve_mr +description: Count of unique merge requests created per month +category: Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter +action: create +label_description: "Mirrored RedisHLL i_code_review_user_create_mr_monthly events sent to Snowplow" label_description: property_description: value_description: @@ -10,16 +11,16 @@ identifiers: - project - user - namespace -product_section: 'TBD' +product_section: dev product_stage: create product_group: code_review product_category: code_review -milestone: "15.2" -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91493 +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869 distributions: - ce - ee -tiers: +tiers: - free - premium - ultimate diff --git a/config/events/schema.json b/config/events/schema.json index 3a0616e706b..6ce93e1a40e 100644 --- a/config/events/schema.json +++ b/config/events/schema.json @@ -12,59 +12,101 @@ "type": "string" }, "label_description": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] }, "property_description": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] }, "value_description": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] }, "extra_properties": { - "type": ["object", "null"] + "type": [ + "object", + "null" + ] }, "identifiers": { - "type": ["array", "null"], + "type": [ + "array", + "null" + ], "items": { "type": "string", - "enum": ["project", "user", "namespace"] + "enum": [ + "project", + "user", + "namespace" + ] } }, "iglu_schema_url": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] }, "product_section": { "type": "string" }, "product_stage": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] }, "product_group": { "type": "string" }, "product_category": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] }, "introduced_by_url": { - "type": ["uri", "null"] + "type": [ + "string", + "null" + ], + "format": "uri" }, "milestone": { - "type": ["string", "null"], + "type": [ + "string", + "null" + ], "pattern": "^[0-9]+\\.[0-9]+$" }, "distributions": { "type": "array", "items": { "type": "string", - "enum": ["ee", "ce"] + "enum": [ + "ee", + "ce" + ] } }, "tiers": { "type": "array", "items": { "type": "string", - "enum": ["free", "premium", "ultimate"] + "enum": [ + "free", + "premium", + "ultimate" + ] } } } -} +}
\ No newline at end of file diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 94a50dc416e..ae2eb043fdd 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -25,6 +25,8 @@ - cluster_cost_management - code_quality - code_review +- code_search +- code_suggestions - code_testing - commerce_integrations - compliance_management @@ -49,6 +51,7 @@ - design_system - devops_reports - disaster_recovery +- dora_metrics - dynamic_application_security_testing - editor_extension - environment_management @@ -67,7 +70,6 @@ - geo_replication - git_lfs - gitaly -- gitlab_docs - global_search - helm_chart_registry - importers @@ -105,6 +107,7 @@ - pubsec_services - purchase - quality_management +- rate_limiting - redis - release_evidence - release_orchestration @@ -116,6 +119,7 @@ - runner_fleet - runner_saas - saas_provisioning +- sbom - scalability - secret_detection - secrets_management @@ -124,13 +128,11 @@ - service_desk - service_ping - sm_provisioning -- snippets - source_code_management - static_application_security_testing - subgroups - subscription_cost_management - subscription_management -- subscription_usage_reports - system_access - team_planning - tracing diff --git a/config/feature_flags/development/approval_rules_pagination.yml b/config/feature_flags/development/add_refresh_pull_mirror_worker.yml index 78d4ad37ced..f59f0ff3d8e 100644 --- a/config/feature_flags/development/approval_rules_pagination.yml +++ b/config/feature_flags/development/add_refresh_pull_mirror_worker.yml @@ -1,8 +1,8 @@ --- -name: approval_rules_pagination -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91702 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366823 -milestone: '15.2' +name: add_refresh_pull_mirror_worker +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103665 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382226 +milestone: '15.7' type: development group: group::source code -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/allow_dots_on_tf_state_names.yml b/config/feature_flags/development/allow_dots_on_tf_state_names.yml new file mode 100644 index 00000000000..3bbff808eda --- /dev/null +++ b/config/feature_flags/development/allow_dots_on_tf_state_names.yml @@ -0,0 +1,8 @@ +--- +name: allow_dots_on_tf_state_names +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106861 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385597 +milestone: '15.7' +type: development +group: group::configure +default_enabled: false diff --git a/config/feature_flags/development/ban_user_feature_flag.yml b/config/feature_flags/development/ban_user_feature_flag.yml index d06a0668549..74aee3f46f8 100644 --- a/config/feature_flags/development/ban_user_feature_flag.yml +++ b/config/feature_flags/development/ban_user_feature_flag.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61292 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330667 milestone: '13.12' type: development -group: group::access +group: group::authentication and authorization default_enabled: true diff --git a/config/feature_flags/development/batched_migrations_parallel_execution.yml b/config/feature_flags/development/batched_migrations_parallel_execution.yml new file mode 100644 index 00000000000..8cd030b8912 --- /dev/null +++ b/config/feature_flags/development/batched_migrations_parallel_execution.yml @@ -0,0 +1,8 @@ +--- +name: batched_migrations_parallel_execution +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104027 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384883 +milestone: '15.7' +type: development +group: group::database +default_enabled: false diff --git a/config/feature_flags/development/block_weak_passwords.yml b/config/feature_flags/development/block_weak_passwords.yml deleted file mode 100644 index aaa8c2cac38..00000000000 --- a/config/feature_flags/development/block_weak_passwords.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: block_weak_passwords -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86310 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363445 -milestone: '15.4' -type: development -group: group::authentication and authorization -default_enabled: false diff --git a/config/feature_flags/development/ci_retry_job_fix.yml b/config/feature_flags/development/cache_project_integrations.yml index 30782e57dea..3bb652d4b51 100644 --- a/config/feature_flags/development/ci_retry_job_fix.yml +++ b/config/feature_flags/development/cache_project_integrations.yml @@ -1,8 +1,8 @@ --- -name: ci_retry_job_fix -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100712 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207988 -milestone: '15.6' +name: cache_project_integrations +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104062 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384004 +milestone: '15.7' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/check_ip_address_for_email_verification.yml b/config/feature_flags/development/check_ip_address_for_email_verification.yml new file mode 100644 index 00000000000..1d0c640d9a4 --- /dev/null +++ b/config/feature_flags/development/check_ip_address_for_email_verification.yml @@ -0,0 +1,8 @@ +--- +name: check_ip_address_for_email_verification +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106441 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385196 +milestone: "15.7" +type: development +group: group::anti-abuse +default_enabled: false diff --git a/config/feature_flags/development/run_pipeline_graphql.yml b/config/feature_flags/development/ci_bridge_remove_sourced_pipelines.yml index 78d8afbbee5..503e676d4ab 100644 --- a/config/feature_flags/development/run_pipeline_graphql.yml +++ b/config/feature_flags/development/ci_bridge_remove_sourced_pipelines.yml @@ -1,8 +1,8 @@ --- -name: run_pipeline_graphql -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96633 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372310 -milestone: '15.4' +name: ci_bridge_remove_sourced_pipelines +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105708 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384359 +milestone: '15.7' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/ci_build_partition_id_token_prefix.yml b/config/feature_flags/development/ci_build_partition_id_token_prefix.yml new file mode 100644 index 00000000000..5b3cd22a489 --- /dev/null +++ b/config/feature_flags/development/ci_build_partition_id_token_prefix.yml @@ -0,0 +1,8 @@ +--- +name: ci_build_partition_id_token_prefix +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106179 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385401 +milestone: '15.7' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml b/config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml index 179fef03d5e..14c435f294a 100644 --- a/config/feature_flags/development/ci_assign_job_token_on_scheduling.yml +++ b/config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml @@ -1,8 +1,8 @@ --- -name: ci_assign_job_token_on_scheduling -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103377 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382042 -milestone: '15.6' +name: ci_enforce_rate_limits_jobs_api +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104912 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384186 +milestone: '15.7' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/pipeline_tabs_vue.yml b/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml index 848166d2cc1..42afd4235cc 100644 --- a/config/feature_flags/development/pipeline_tabs_vue.yml +++ b/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml @@ -1,8 +1,8 @@ --- -name: pipeline_tabs_vue -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80401 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353118 -milestone: '14.10' +name: ci_hooks_pre_get_sources_script +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102332 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381840 +milestone: '15.6' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/ci_job_token_scope.yml b/config/feature_flags/development/ci_job_token_scope.yml index 464fc77a69e..c86a3eca25d 100644 --- a/config/feature_flags/development/ci_job_token_scope.yml +++ b/config/feature_flags/development/ci_job_token_scope.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49750 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300821 milestone: '13.12' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml b/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml index ab135526c0b..0b6fc6022f4 100644 --- a/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml +++ b/config/feature_flags/development/ci_raw_variables_in_yaml_config.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375034 milestone: '15.6' type: development group: group::pipeline authoring -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/graphql_job_app.yml b/config/feature_flags/development/ci_refactoring_external_mapper.yml index a0f0cb71e17..22933d253d4 100644 --- a/config/feature_flags/development/graphql_job_app.yml +++ b/config/feature_flags/development/ci_refactoring_external_mapper.yml @@ -1,8 +1,8 @@ --- -name: graphql_job_app -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96703 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372276 -milestone: '15.4' +name: ci_refactoring_external_mapper +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106408 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385179 +milestone: '15.7' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/ci_register_job_temporary_lock.yml b/config/feature_flags/development/ci_register_job_temporary_lock.yml index f404df8f85b..d839669b2ea 100644 --- a/config/feature_flags/development/ci_register_job_temporary_lock.yml +++ b/config/feature_flags/development/ci_register_job_temporary_lock.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55202 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323180 milestone: '13.10' type: development -group: group::memory +group: group::pipeline excution default_enabled: false diff --git a/config/feature_flags/development/ci_reuse_build_in_seed_context.yml b/config/feature_flags/development/ci_reuse_build_in_seed_context.yml new file mode 100644 index 00000000000..aa63b8d898f --- /dev/null +++ b/config/feature_flags/development/ci_reuse_build_in_seed_context.yml @@ -0,0 +1,8 @@ +--- +name: ci_reuse_build_in_seed_context +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105492 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384577 +milestone: '15.7' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml b/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml deleted file mode 100644 index 7cb79c05774..00000000000 --- a/config/feature_flags/development/ci_update_unlocked_job_artifacts.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_update_unlocked_job_artifacts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70235 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343465 -milestone: '14.5' -type: development -group: group::pipeline insights -default_enabled: true diff --git a/config/feature_flags/development/collect_package_events.yml b/config/feature_flags/development/collect_package_events.yml index 488dce6a724..68ceb596d8a 100644 --- a/config/feature_flags/development/collect_package_events.yml +++ b/config/feature_flags/development/collect_package_events.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45802 rollout_issue_url: milestone: '13.6' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml b/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml deleted file mode 100644 index ef531228398..00000000000 --- a/config/feature_flags/development/container_registry_delete_repository_with_cron_worker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: container_registry_delete_repository_with_cron_worker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101918 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378818 -milestone: '15.6' -type: development -group: group::container registry -default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml b/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml index 8b952b79f9b..3fbe5acb0d1 100644 --- a/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml +++ b/config/feature_flags/development/container_registry_migration_limit_gitlab_org.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78613 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml b/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml index 6742a006519..bcb116ea98e 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83135 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.10' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml index 846bc8b690b..2d47d608f2d 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_1.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml index fcbcc5bfb48..c03c063d9a2 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_10.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml index 11e66a5531e..febf7d323b4 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_2.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85277 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.10' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml index b52693e0aba..35a33ebd281 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_25.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml index f26ddd99607..2f35c3105fc 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86543 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '15.1' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml index 544354f1b84..80903b0a522 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_5.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85908 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '15.0' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml b/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml index f6a5ae36c07..6635151fe19 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88997 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '15.1' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_enabled.yml b/config/feature_flags/development/container_registry_migration_phase2_enabled.yml index c48cbdb435e..a4c5d7bffa0 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_enabled.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_enabled.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml index 9a312161824..587096b0890 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_fast.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml index f02259be928..531b5b0549f 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_enqueue_speed_slow.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79061 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '14.8' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/debian_group_packages.yml b/config/feature_flags/development/debian_group_packages.yml index bc0c2eaf8eb..63a9220369d 100644 --- a/config/feature_flags/development/debian_group_packages.yml +++ b/config/feature_flags/development/debian_group_packages.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66188 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336536 milestone: '14.1' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/debian_packages.yml b/config/feature_flags/development/debian_packages.yml index 98bc5d898a5..077c75b9f57 100644 --- a/config/feature_flags/development/debian_packages.yml +++ b/config/feature_flags/development/debian_packages.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42670 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337288 milestone: '13.5' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml deleted file mode 100644 index 6adfba96e10..00000000000 --- a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: disable_metric_dashboard_refresh_rate -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37195 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229841 -milestone: '13.2' -type: development -group: group::respond -default_enabled: false diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml index 50c22b52d11..71146d9236b 100644 --- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml +++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276918 milestone: '13.5' type: development group: group::code review -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/always_async_project_authorizations_refresh.yml b/config/feature_flags/development/enable_environments_search_within_folder.yml index f5ec2473af8..a03b31ffbfc 100644 --- a/config/feature_flags/development/always_async_project_authorizations_refresh.yml +++ b/config/feature_flags/development/enable_environments_search_within_folder.yml @@ -1,8 +1,8 @@ --- -name: always_async_project_authorizations_refresh -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92333 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367683 -milestone: '15.3' +name: enable_environments_search_within_folder +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102227/diffs +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382108 +milestone: '15.7' type: development -group: group::workspace +group: group::release default_enabled: true diff --git a/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml b/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml index cacc564df73..846052dc76f 100644 --- a/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml +++ b/config/feature_flags/development/enable_minor_delay_during_project_authorizations_refresh.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373672 milestone: '15.4' type: development group: group::workspace -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/require_approval_on_scan_removal.yml b/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml index 2cbbe8e49f8..e72dc713e02 100644 --- a/config/feature_flags/development/require_approval_on_scan_removal.yml +++ b/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml @@ -1,8 +1,8 @@ --- -name: require_approval_on_scan_removal -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102631 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382079 -milestone: '15.6' +name: enforce_scan_result_policies_for_preexisting_vulnerabilities +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105248 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384260 +milestone: '15.7' type: development group: group::security policies default_enabled: false diff --git a/config/feature_flags/development/ci_partitioning_use_ci_builds_metadata_routing_table.yml b/config/feature_flags/development/environment_details_vue.yml index 71c2aa735a2..5a647f65a7a 100644 --- a/config/feature_flags/development/ci_partitioning_use_ci_builds_metadata_routing_table.yml +++ b/config/feature_flags/development/environment_details_vue.yml @@ -1,8 +1,8 @@ --- -name: ci_partitioning_use_ci_builds_metadata_routing_table -introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100935" -rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/378601" -milestone: '15.6' +name: environment_details_vue +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105527" +rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/384914" +milestone: '15.7' type: development -group: "group::pipeline execution" +group: group::release default_enabled: false diff --git a/config/feature_flags/development/markup_rendering_timeout.yml b/config/feature_flags/development/fork_divergence_counts.yml index 6c579ebe28a..929e9fae790 100644 --- a/config/feature_flags/development/markup_rendering_timeout.yml +++ b/config/feature_flags/development/fork_divergence_counts.yml @@ -1,8 +1,8 @@ --- -name: markup_rendering_timeout -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89509 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365358 -milestone: '15.1' +name: fork_divergence_counts +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103814 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382878 +milestone: '15.7' type: development group: group::source code default_enabled: false diff --git a/config/feature_flags/development/forti_authenticator.yml b/config/feature_flags/development/forti_authenticator.yml index f3360d136ec..63e780ccc64 100644 --- a/config/feature_flags/development/forti_authenticator.yml +++ b/config/feature_flags/development/forti_authenticator.yml @@ -1,8 +1,8 @@ --- name: forti_authenticator introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45055 -rollout_issue_url: +rollout_issue_url: milestone: '13.5' type: development -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/forti_token_cloud.yml b/config/feature_flags/development/forti_token_cloud.yml index 10f143ca912..5bf350c9b33 100644 --- a/config/feature_flags/development/forti_token_cloud.yml +++ b/config/feature_flags/development/forti_token_cloud.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49089 rollout_issue_url: milestone: '13.7' type: development -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/geo_container_repository_replication.yml b/config/feature_flags/development/geo_container_repository_replication.yml deleted file mode 100644 index 94682cc63cc..00000000000 --- a/config/feature_flags/development/geo_container_repository_replication.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: geo_container_repository_replication -introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93690" -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366662 -milestone: '15.5' -type: development -group: group::geo -default_enabled: true diff --git a/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml b/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml new file mode 100644 index 00000000000..7ff87410458 --- /dev/null +++ b/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml @@ -0,0 +1,8 @@ +--- +name: github_client_fetch_repos_via_graphql +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105824 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385649 +milestone: '15.7' +type: development +group: group::import +default_enabled: false diff --git a/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml b/config/feature_flags/development/gitlab_metrics_error_rate_sli.yml index d6b28c28600..30b872343ce 100644 --- a/config/feature_flags/development/verify_gitlab_shell_worker_method_names.yml +++ b/config/feature_flags/development/gitlab_metrics_error_rate_sli.yml @@ -1,8 +1,8 @@ --- -name: verify_gitlab_shell_worker_method_names -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103783 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371470 -milestone: '15.6' +name: gitlab_metrics_error_rate_sli +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103976 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383071 +milestone: '15.7' type: development group: group::scalability default_enabled: false diff --git a/config/feature_flags/development/enhanced_webhook_support_regex.yml b/config/feature_flags/development/gitlab_pat_auto_revocation.yml index 2c0d2c82dbf..3bbbadac23f 100644 --- a/config/feature_flags/development/enhanced_webhook_support_regex.yml +++ b/config/feature_flags/development/gitlab_pat_auto_revocation.yml @@ -1,8 +1,8 @@ --- -name: enhanced_webhook_support_regex -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97235 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375728 +name: gitlab_pat_auto_revocation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103713 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382610 milestone: '15.6' type: development -group: group::integrations +group: group::static analysis default_enabled: false diff --git a/config/feature_flags/development/go_proxy.yml b/config/feature_flags/development/go_proxy.yml index 4ec5dc786fd..ead133232e4 100644 --- a/config/feature_flags/development/go_proxy.yml +++ b/config/feature_flags/development/go_proxy.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27746 rollout_issue_url: milestone: '13.1' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/go_proxy_disable_gomod_validation.yml b/config/feature_flags/development/go_proxy_disable_gomod_validation.yml index f361d3392ec..5cf5ff528af 100644 --- a/config/feature_flags/development/go_proxy_disable_gomod_validation.yml +++ b/config/feature_flags/development/go_proxy_disable_gomod_validation.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34338 rollout_issue_url: milestone: '13.1' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml b/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml deleted file mode 100644 index 7b4c884a82f..00000000000 --- a/config/feature_flags/development/graphql_keyset_pagination_without_next_page_query.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: graphql_keyset_pagination_without_next_page_query -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97509 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373792 -milestone: '15.4' -type: development -group: group::optimize -default_enabled: true diff --git a/config/feature_flags/development/group_protected_branches.yml b/config/feature_flags/development/group_protected_branches.yml new file mode 100644 index 00000000000..4d580734dc4 --- /dev/null +++ b/config/feature_flags/development/group_protected_branches.yml @@ -0,0 +1,8 @@ +--- +name: group_protected_branches +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372816 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383178 +milestone: '15.7' +type: development +group: group::compliance +default_enabled: false diff --git a/config/feature_flags/development/harbor_registry_integration.yml b/config/feature_flags/development/harbor_registry_integration.yml index 84d9709ca30..f1786f53c19 100644 --- a/config/feature_flags/development/harbor_registry_integration.yml +++ b/config/feature_flags/development/harbor_registry_integration.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81593 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353595 milestone: '14.9' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/hash_based_cache_for_protected_branches.yml b/config/feature_flags/development/hash_based_cache_for_protected_branches.yml index 4e071707182..58372ff3516 100644 --- a/config/feature_flags/development/hash_based_cache_for_protected_branches.yml +++ b/config/feature_flags/development/hash_based_cache_for_protected_branches.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368279 milestone: '15.3' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/hide_public_email_on_profile.yml b/config/feature_flags/development/hide_public_email_on_profile.yml index 87ed700c359..acf8e4e9ca7 100644 --- a/config/feature_flags/development/hide_public_email_on_profile.yml +++ b/config/feature_flags/development/hide_public_email_on_profile.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79717 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351731 milestone: '14.8' type: development -group: group::optimize +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/integrated_error_tracking.yml b/config/feature_flags/development/integrated_error_tracking.yml index fb302daed57..33b7b20ab29 100644 --- a/config/feature_flags/development/integrated_error_tracking.yml +++ b/config/feature_flags/development/integrated_error_tracking.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81767 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353956 milestone: '14.9' type: development -group: group::respond +group: group::observability default_enabled: false diff --git a/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml b/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml deleted file mode 100644 index 05232d0f80a..00000000000 --- a/config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: jira_connect_oauth_self_managed_setting -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100725 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377679 -milestone: '15.6' -type: development -group: group::integrations -default_enabled: false diff --git a/config/feature_flags/development/limit_assigned_issues_count.yml b/config/feature_flags/development/limit_assigned_issues_count.yml new file mode 100644 index 00000000000..7fb58220f26 --- /dev/null +++ b/config/feature_flags/development/limit_assigned_issues_count.yml @@ -0,0 +1,8 @@ +--- +name: limit_assigned_issues_count +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105759 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384363 +milestone: '15.7' +type: development +group: group::project management +default_enabled: false diff --git a/config/feature_flags/development/linear_group_descendants_finder_upto.yml b/config/feature_flags/development/linear_group_descendants_finder_upto.yml index ef045ebfa7a..db3a37191ff 100644 --- a/config/feature_flags/development/linear_group_descendants_finder_upto.yml +++ b/config/feature_flags/development/linear_group_descendants_finder_upto.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78991 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350972 milestone: '14.8' type: development -group: group::authentication and authorization +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/linear_project_ancestors.yml b/config/feature_flags/development/linear_project_ancestors.yml index 28c8fbcbf59..00b04b20b30 100644 --- a/config/feature_flags/development/linear_project_ancestors.yml +++ b/config/feature_flags/development/linear_project_ancestors.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68072 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338403 milestone: '14.2' type: development -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/linear_user_manageable_groups.yml b/config/feature_flags/development/linear_user_manageable_groups.yml index e5822fc3d7d..8d59d689f6e 100644 --- a/config/feature_flags/development/linear_user_manageable_groups.yml +++ b/config/feature_flags/development/linear_user_manageable_groups.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68845 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339434 milestone: '14.3' type: development -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/maven_central_request_forwarding.yml b/config/feature_flags/development/maven_central_request_forwarding.yml index 756a931b3a1..46e4cbe5aca 100644 --- a/config/feature_flags/development/maven_central_request_forwarding.yml +++ b/config/feature_flags/development/maven_central_request_forwarding.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85299 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359553 milestone: '15.4' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml b/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml deleted file mode 100644 index 5c3c76dd252..00000000000 --- a/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: metrics_dashboard_exhaustive_validations -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40103 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241697 -milestone: '13.4' -type: development -group: group::respond -default_enabled: false diff --git a/config/feature_flags/development/allow_audit_event_type_filtering.yml b/config/feature_flags/development/mirror_only_branches_match_regex.yml index e5cbd2fddcf..6494569b364 100644 --- a/config/feature_flags/development/allow_audit_event_type_filtering.yml +++ b/config/feature_flags/development/mirror_only_branches_match_regex.yml @@ -1,8 +1,8 @@ --- -name: allow_audit_event_type_filtering -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102502 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373833 +name: mirror_only_branches_match_regex +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99201 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381667 milestone: '15.6' type: development -group: group::compliance +group: "group::source code" default_enabled: false diff --git a/config/feature_flags/development/mr_compare_dropdowns.yml b/config/feature_flags/development/mr_compare_dropdowns.yml new file mode 100644 index 00000000000..bffab02389b --- /dev/null +++ b/config/feature_flags/development/mr_compare_dropdowns.yml @@ -0,0 +1,8 @@ +--- +name: mr_compare_dropdowns +introduced_by_url: +rollout_issue_url: +milestone: '15.7' +type: development +group: group::code review +default_enabled: false diff --git a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml new file mode 100644 index 00000000000..c282313f409 --- /dev/null +++ b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml @@ -0,0 +1,8 @@ +--- +name: multiple_environment_approval_rules_fe +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105719 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384334 +milestone: '15.7' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/ci_secure_files.yml b/config/feature_flags/development/new_fonts.yml index a1aa82fe298..20bf283e704 100644 --- a/config/feature_flags/development/ci_secure_files.yml +++ b/config/feature_flags/development/new_fonts.yml @@ -1,8 +1,8 @@ --- -name: ci_secure_files -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78227 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350748 -milestone: '14.8' +name: new_fonts +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102347 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379147 +milestone: '15.7' type: development -group: group::incubation +group: group::foundations default_enabled: false diff --git a/config/feature_flags/development/dast_api_scanner.yml b/config/feature_flags/development/on_demand_scans_runner_tags.yml index 5cc268ee9b9..e25c6f8e3d1 100644 --- a/config/feature_flags/development/dast_api_scanner.yml +++ b/config/feature_flags/development/on_demand_scans_runner_tags.yml @@ -1,8 +1,8 @@ --- -name: dast_api_scanner -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73564 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345837 -milestone: '14.7' +name: on_demand_scans_runner_tags +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103634 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381910 +milestone: '15.7' type: development group: group::dynamic analysis -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/operational_vulnerabilities_filters.yml b/config/feature_flags/development/operational_vulnerabilities_filters.yml deleted file mode 100644 index 93206935a94..00000000000 --- a/config/feature_flags/development/operational_vulnerabilities_filters.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: operational_vulnerabilities_filters -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90845 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365986 -milestone: '15.2' -type: development -group: group::container security -default_enabled: true diff --git a/config/feature_flags/development/optimized_housekeeping.yml b/config/feature_flags/development/optimized_housekeeping.yml index 9a5b9244116..478d5ee22e7 100644 --- a/config/feature_flags/development/optimized_housekeeping.yml +++ b/config/feature_flags/development/optimized_housekeeping.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353607 milestone: '14.9' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/package_registry_access_level.yml b/config/feature_flags/development/package_registry_access_level.yml index 093315f77bd..3434e7f4260 100644 --- a/config/feature_flags/development/package_registry_access_level.yml +++ b/config/feature_flags/development/package_registry_access_level.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82808 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363018 milestone: '15.0' type: development -group: group::package -default_enabled: false +group: group::package registry +default_enabled: true diff --git a/config/feature_flags/development/pipeline_name.yml b/config/feature_flags/development/pipeline_name.yml index 40557a7d01e..9070e754fff 100644 --- a/config/feature_flags/development/pipeline_name.yml +++ b/config/feature_flags/development/pipeline_name.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376095 milestone: '15.5' type: development group: group::delivery -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/project_list_filter_bar.yml b/config/feature_flags/development/pipeline_name_search.yml index 29d5d67af95..ccf4f4a6c9c 100644 --- a/config/feature_flags/development/project_list_filter_bar.yml +++ b/config/feature_flags/development/pipeline_name_search.yml @@ -1,8 +1,8 @@ --- -name: project_list_filter_bar -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/11209 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321404 -milestone: '11.11' +name: pipeline_name_search +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107086 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385864 +milestone: '15.7' type: development -group: group::access +group: group::delivery default_enabled: false diff --git a/config/feature_flags/development/prometheus_computed_alerts.yml b/config/feature_flags/development/project_language_search.yml index 97912685fb5..2d8c24650d1 100644 --- a/config/feature_flags/development/prometheus_computed_alerts.yml +++ b/config/feature_flags/development/project_language_search.yml @@ -1,8 +1,8 @@ --- -name: prometheus_computed_alerts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13443 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255304 -milestone: '12.0' +name: project_language_search +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104167 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385465 +milestone: '15.7' type: development -group: group::respond +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/projects_preloader_fix.yml b/config/feature_flags/development/projects_preloader_fix.yml index 1ad578f11a4..58c56257028 100644 --- a/config/feature_flags/development/projects_preloader_fix.yml +++ b/config/feature_flags/development/projects_preloader_fix.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378858 milestone: '15.6' type: development group: group::workspace -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml b/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml index 67a465ef6d6..667c0db7ee0 100644 --- a/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml +++ b/config/feature_flags/development/rate_limit_gitlab_shell_by_ip.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367998 milestone: '15.3' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/realtime_mr_status_change.yml b/config/feature_flags/development/realtime_mr_status_change.yml new file mode 100644 index 00000000000..0cba2d3ca57 --- /dev/null +++ b/config/feature_flags/development/realtime_mr_status_change.yml @@ -0,0 +1,8 @@ +--- +name: realtime_mr_status_change +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103011 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385077 +milestone: '15.7' +type: development +group: group::code review +default_enabled: false diff --git a/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml b/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml index 503eb95dd62..c4ef2e4be9d 100644 --- a/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml +++ b/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88292 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 milestone: '15.1' type: development -group: group::package +group: group::container registry default_enabled: false diff --git a/config/feature_flags/development/root_statistics_worker_read_replica.yml b/config/feature_flags/development/root_statistics_worker_read_replica.yml deleted file mode 100644 index 516bead1ee7..00000000000 --- a/config/feature_flags/development/root_statistics_worker_read_replica.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: root_statistics_worker_read_replica -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102516 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379678 -milestone: '15.6' -type: development -group: group::utilization -default_enabled: false diff --git a/config/feature_flags/development/route_hll_to_snowplow_phase3.yml b/config/feature_flags/development/route_hll_to_snowplow_phase3.yml new file mode 100644 index 00000000000..5a000a0569a --- /dev/null +++ b/config/feature_flags/development/route_hll_to_snowplow_phase3.yml @@ -0,0 +1,8 @@ +--- +name: route_hll_to_snowplow_phase3 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104947 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383657 +milestone: '15.7' +type: development +group: 'group::product intelligence' +default_enabled: false diff --git a/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml b/config/feature_flags/development/route_hll_to_snowplow_phase4.yml index 71d5836bee1..a4109b15533 100644 --- a/config/feature_flags/development/ci_skip_auto_cancelation_on_child_pipelines.yml +++ b/config/feature_flags/development/route_hll_to_snowplow_phase4.yml @@ -1,8 +1,8 @@ --- -name: ci_skip_auto_cancelation_on_child_pipelines -introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100854" -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377712 -milestone: '15.5' +name: route_hll_to_snowplow_phase4 +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103528" +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366767 +milestone: '15.7' type: development -group: group::pipeline execution +group: group::product intelligence default_enabled: false diff --git a/config/feature_flags/development/rpm_packages.yml b/config/feature_flags/development/rpm_packages.yml index a342f1203f7..2ed00b2cf11 100644 --- a/config/feature_flags/development/rpm_packages.yml +++ b/config/feature_flags/development/rpm_packages.yml @@ -4,5 +4,5 @@ introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96019' rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/371863' milestone: '15.4' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/rubygem_packages.yml b/config/feature_flags/development/rubygem_packages.yml index 9f394f091bb..3a05251d9b6 100644 --- a/config/feature_flags/development/rubygem_packages.yml +++ b/config/feature_flags/development/rubygem_packages.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52147 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299383 milestone: '13.9' type: development -group: group::package +group: group::package registry default_enabled: false diff --git a/config/feature_flags/development/scan_execution_rule_mode.yml b/config/feature_flags/development/scan_execution_rule_mode.yml deleted file mode 100644 index 6e3dd6acf92..00000000000 --- a/config/feature_flags/development/scan_execution_rule_mode.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: scan_execution_rule_mode -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90099 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359883 -milestone: '15.2' -type: development -group: group::container security -default_enabled: true diff --git a/config/feature_flags/development/automated_email_provision.yml b/config/feature_flags/development/scan_execution_tags.yml index 2734413dd8f..bd9412a4e9c 100644 --- a/config/feature_flags/development/automated_email_provision.yml +++ b/config/feature_flags/development/scan_execution_tags.yml @@ -1,8 +1,8 @@ --- -name: automated_email_provision -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75872 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348317 -milestone: '14.6' +name: scan_execution_tags +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104954 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385169 +milestone: '15.7' type: development -group: group::license +group: group::security policies default_enabled: true diff --git a/config/feature_flags/development/schema_linting.yml b/config/feature_flags/development/schema_linting.yml index 6c1cbdb5248..0abca3e03dc 100644 --- a/config/feature_flags/development/schema_linting.yml +++ b/config/feature_flags/development/schema_linting.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255919 milestone: '13.2' type: development group: group::editor -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/search_page_vertical_nav.yml b/config/feature_flags/development/search_page_vertical_nav.yml index 58088cee802..a0e9d760295 100644 --- a/config/feature_flags/development/search_page_vertical_nav.yml +++ b/config/feature_flags/development/search_page_vertical_nav.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373613 milestone: '15.5' type: development group: group::global search -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/secure_files_metadata_parsers.yml b/config/feature_flags/development/secure_files_metadata_parsers.yml deleted file mode 100644 index 2d6eed27f4b..00000000000 --- a/config/feature_flags/development/secure_files_metadata_parsers.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: secure_files_metadata_parsers -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99046 -rollout_issue_url: -milestone: '15.5' -type: development -group: group::incubation -default_enabled: false diff --git a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml index 820e6cafb41..aa8e243e89e 100644 --- a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml +++ b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66525 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336592 milestone: '14.2' type: development -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/split_operations_visibility_permissions.yml b/config/feature_flags/development/split_operations_visibility_permissions.yml deleted file mode 100644 index 56955733217..00000000000 --- a/config/feature_flags/development/split_operations_visibility_permissions.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: split_operations_visibility_permissions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89089 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364240 -milestone: '15.1' -type: development -group: group::respond -default_enabled: true diff --git a/config/feature_flags/development/lazy_load_commits.yml b/config/feature_flags/development/ssh_commit_signatures.yml index 6140b88c3c2..a056ba1a2ba 100644 --- a/config/feature_flags/development/lazy_load_commits.yml +++ b/config/feature_flags/development/ssh_commit_signatures.yml @@ -1,8 +1,8 @@ --- -name: lazy_load_commits -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71633 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342497 -milestone: '14.4' +name: ssh_commit_signatures +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97248 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350301 +milestone: '15.7' type: development group: group::source code default_enabled: true diff --git a/config/feature_flags/development/subgroups_approval_rules.yml b/config/feature_flags/development/subgroups_approval_rules.yml deleted file mode 100644 index e7935f5e5d2..00000000000 --- a/config/feature_flags/development/subgroups_approval_rules.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: subgroups_approval_rules -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91598 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366741 -milestone: '15.2' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/actors_aware_gitaly_calls.yml b/config/feature_flags/development/super_sidebar_nav.yml index 0ae6140c579..cf088956bc0 100644 --- a/config/feature_flags/development/actors_aware_gitaly_calls.yml +++ b/config/feature_flags/development/super_sidebar_nav.yml @@ -1,8 +1,8 @@ --- -name: actors_aware_gitaly_calls -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101218 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381516 -milestone: '15.6' +name: super_sidebar_nav +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101910 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381456 +milestone: '15.7' type: development -group: group::gitaly +group: group::foundations default_enabled: false diff --git a/config/feature_flags/development/check_etags_diffs_batch_before_write_cache.yml b/config/feature_flags/development/track_and_raise_delete_source_errors.yml index fb03ff91d0a..5f34ab47f19 100644 --- a/config/feature_flags/development/check_etags_diffs_batch_before_write_cache.yml +++ b/config/feature_flags/development/track_and_raise_delete_source_errors.yml @@ -1,7 +1,7 @@ --- -name: check_etags_diffs_batch_before_write_cache -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101421 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378333 +name: track_and_raise_delete_source_errors +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103842 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382440 milestone: '15.6' type: development group: group::code review diff --git a/config/feature_flags/development/two_factor_for_cli.yml b/config/feature_flags/development/two_factor_for_cli.yml index e442bb035cf..341f06d9ffa 100644 --- a/config/feature_flags/development/two_factor_for_cli.yml +++ b/config/feature_flags/development/two_factor_for_cli.yml @@ -1,8 +1,8 @@ --- name: two_factor_for_cli introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39703 -rollout_issue_url: +rollout_issue_url: milestone: '13.5' type: development -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml b/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml deleted file mode 100644 index f3a3772972e..00000000000 --- a/config/feature_flags/development/usage_data_ci_i_testing_coverage_report_uploaded.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_ci_i_testing_coverage_report_uploaded -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102371 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339721 -milestone: '15.6' -type: development -group: group::pipeline insights -default_enabled: false diff --git a/config/feature_flags/development/usage_data_diff_searches.yml b/config/feature_flags/development/usage_data_diff_searches.yml deleted file mode 100644 index 70c053b7a17..00000000000 --- a/config/feature_flags/development/usage_data_diff_searches.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: usage_data_diff_searches -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86603 -rollout_issue_url: -milestone: '15.0' -type: development -group: group::code review -default_enabled: true diff --git a/config/feature_flags/development/indifferent_wal_location_keys.yml b/config/feature_flags/development/use_ref_type_parameter.yml index 2d89ad82085..5cdd3d6f198 100644 --- a/config/feature_flags/development/indifferent_wal_location_keys.yml +++ b/config/feature_flags/development/use_ref_type_parameter.yml @@ -1,8 +1,9 @@ --- -name: indifferent_wal_location_keys -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101096 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377989 -milestone: '15.5' +name: use_ref_type_parameter +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102936 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381501 +milestone: '15.6' type: development group: group::source code default_enabled: false + diff --git a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml index b2262c9707e..3eece0b906a 100644 --- a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml +++ b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78542 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350637 milestone: '14.8' type: development -group: group::authentication and authorization +group: group::workspace default_enabled: true diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml index 098b96e97f0..77ee79fe80a 100644 --- a/config/feature_flags/development/user_time_settings.yml +++ b/config/feature_flags/development/user_time_settings.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321407 milestone: '11.11' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml b/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml deleted file mode 100644 index 0fc30f63047..00000000000 --- a/config/feature_flags/development/verify_mail_scheduler_notification_service_worker_method_names.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: verify_mail_scheduler_notification_service_worker_method_names -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103785 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371470 -milestone: '15.6' -type: development -group: group::scalability -default_enabled: false diff --git a/config/feature_flags/development/web_hooks_disable_failed.yml b/config/feature_flags/development/web_hooks_disable_failed.yml deleted file mode 100644 index 3a7c85edafc..00000000000 --- a/config/feature_flags/development/web_hooks_disable_failed.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: web_hooks_disable_failed -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60837 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329849 -milestone: '13.12' -type: development -group: group::integrations -default_enabled: false diff --git a/config/feature_flags/development/web_hooks_no_rate_limit.yml b/config/feature_flags/development/web_hooks_no_rate_limit.yml deleted file mode 100644 index 387aa8bb007..00000000000 --- a/config/feature_flags/development/web_hooks_no_rate_limit.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: web_hooks_no_rate_limit -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90868 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366084 -milestone: '15.2' -type: development -group: group::integrations -default_enabled: false diff --git a/config/feature_flags/development/webauthn.yml b/config/feature_flags/development/webauthn.yml index 135d4af2465..6bd4fc95020 100644 --- a/config/feature_flags/development/webauthn.yml +++ b/config/feature_flags/development/webauthn.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26692 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232671 milestone: '13.4' type: development -group: group::access +group: group::authentication and authorization default_enabled: true diff --git a/config/feature_flags/development/webhook_form_mask_url.yml b/config/feature_flags/development/webhook_form_mask_url.yml deleted file mode 100644 index 445fcb0b6b3..00000000000 --- a/config/feature_flags/development/webhook_form_mask_url.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: webhook_form_mask_url -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99995 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376106 -milestone: '15.5' -type: development -group: group::integrations -default_enabled: false diff --git a/config/feature_flags/development/webhooks_failed_callout.yml b/config/feature_flags/development/webhooks_failed_callout.yml deleted file mode 100644 index 11de5a793f6..00000000000 --- a/config/feature_flags/development/webhooks_failed_callout.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: webhooks_failed_callout -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91092 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365535 -milestone: '15.2' -type: development -group: group::integrations -default_enabled: false diff --git a/config/feature_flags/experiment/generic_explore_groups.yml b/config/feature_flags/experiment/generic_explore_groups.yml index 635af65f000..d928dcd4189 100644 --- a/config/feature_flags/experiment/generic_explore_groups.yml +++ b/config/feature_flags/experiment/generic_explore_groups.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381564 milestone: '15.6' type: experiment group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/ops/jira_raise_timeouts.yml b/config/feature_flags/ops/advanced_user_search.yml index ac572b172fc..0f52e9f22f0 100644 --- a/config/feature_flags/ops/jira_raise_timeouts.yml +++ b/config/feature_flags/ops/advanced_user_search.yml @@ -1,8 +1,8 @@ --- -name: jira_raise_timeouts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86439 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375587 -milestone: '15.0' +name: advanced_user_search +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102724 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382542 +milestone: '15.7' type: ops -group: group::integrations +group: group::global search default_enabled: false diff --git a/config/feature_flags/ops/automatic_lock_writes_on_table.yml b/config/feature_flags/ops/automatic_lock_writes_on_table.yml new file mode 100644 index 00000000000..ade0bcb0d19 --- /dev/null +++ b/config/feature_flags/ops/automatic_lock_writes_on_table.yml @@ -0,0 +1,8 @@ +--- +name: automatic_lock_writes_on_table +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99287 +rollout_issue_url: +milestone: '15.7' +type: ops +group: group::pods +default_enabled: false diff --git a/config/feature_flags/ops/block_password_auth_for_saml_users.yml b/config/feature_flags/ops/block_password_auth_for_saml_users.yml index 492c00f2dd5..d84d8b5133b 100644 --- a/config/feature_flags/ops/block_password_auth_for_saml_users.yml +++ b/config/feature_flags/ops/block_password_auth_for_saml_users.yml @@ -4,5 +4,5 @@ introduced_by_url: rollout_issue_url: milestone: '13.11' type: ops -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/ops/dynamic_image_resizing.yml b/config/feature_flags/ops/dynamic_image_resizing.yml index f456fa8bf1e..2b83b043a22 100644 --- a/config/feature_flags/ops/dynamic_image_resizing.yml +++ b/config/feature_flags/ops/dynamic_image_resizing.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45050 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/266986 milestone: '13.6' type: ops -group: group::memory +group: group::workspace default_enabled: true diff --git a/config/feature_flags/ops/dynamic_nonce.yml b/config/feature_flags/ops/dynamic_nonce.yml index 6a63eda8862..ad8c63f9fa3 100644 --- a/config/feature_flags/ops/dynamic_nonce.yml +++ b/config/feature_flags/ops/dynamic_nonce.yml @@ -4,5 +4,5 @@ introduced_by_url: rollout_issue_url: milestone: '14.0' type: ops -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/ops/enforce_memory_watchdog.yml b/config/feature_flags/ops/enforce_memory_watchdog.yml index 1d1f9a4eef0..fae127564c9 100644 --- a/config/feature_flags/ops/enforce_memory_watchdog.yml +++ b/config/feature_flags/ops/enforce_memory_watchdog.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534 milestone: '15.2' type: ops -group: group::memory +group: group::application performance default_enabled: false diff --git a/config/feature_flags/ops/gitlab_memory_watchdog.yml b/config/feature_flags/ops/gitlab_memory_watchdog.yml index 9b995ea607e..f4c9a489864 100644 --- a/config/feature_flags/ops/gitlab_memory_watchdog.yml +++ b/config/feature_flags/ops/gitlab_memory_watchdog.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534 milestone: '15.2' type: ops -group: group::memory +group: group::application performance default_enabled: false diff --git a/config/feature_flags/ops/gitlab_service_measuring_projects_create_service.yml b/config/feature_flags/ops/gitlab_service_measuring_projects_create_service.yml deleted file mode 100644 index 78e60987a7f..00000000000 --- a/config/feature_flags/ops/gitlab_service_measuring_projects_create_service.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitlab_service_measuring_projects_create_service -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30977 -rollout_issue_url: -milestone: '13.0' -type: ops -group: group::memory -default_enabled: false diff --git a/config/feature_flags/ops/gitlab_service_measuring_projects_import_export_export_service.yml b/config/feature_flags/ops/gitlab_service_measuring_projects_import_export_export_service.yml deleted file mode 100644 index 309492f8be9..00000000000 --- a/config/feature_flags/ops/gitlab_service_measuring_projects_import_export_export_service.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitlab_service_measuring_projects_import_export_export_service -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30977 -rollout_issue_url: -milestone: '13.0' -type: ops -group: group::memory -default_enabled: false diff --git a/config/feature_flags/ops/gitlab_service_measuring_projects_import_service.yml b/config/feature_flags/ops/gitlab_service_measuring_projects_import_service.yml deleted file mode 100644 index 03a8eca99d9..00000000000 --- a/config/feature_flags/ops/gitlab_service_measuring_projects_import_service.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitlab_service_measuring_projects_import_service -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30977 -rollout_issue_url: -milestone: '13.0' -type: ops -group: group::memory -default_enabled: false diff --git a/config/feature_flags/ops/legacy_open_source_license_available.yml b/config/feature_flags/ops/legacy_open_source_license_available.yml index 2408e31633a..36ee6c230bf 100644 --- a/config/feature_flags/ops/legacy_open_source_license_available.yml +++ b/config/feature_flags/ops/legacy_open_source_license_available.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79855 rollout_issue_url: milestone: '14.8' type: ops -group: 'group::authentication and authorization' +group: 'group::workspace' default_enabled: true diff --git a/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml b/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml index 3ee8538b4fd..e01dd2b566c 100644 --- a/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml +++ b/config/feature_flags/ops/recaptcha_on_top_level_group_creation.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56707 rollout_issue_url: milestone: '13.11' type: ops -group: group::access +group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/global_search_error_rate_sli.yml b/config/feature_flags/ops/report_heap_dumps.yml index d1637ad692c..12b126a8f80 100644 --- a/config/feature_flags/development/global_search_error_rate_sli.yml +++ b/config/feature_flags/ops/report_heap_dumps.yml @@ -1,8 +1,8 @@ --- -name: global_search_error_rate_sli -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96667 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373800 -milestone: '15.4' -type: development +name: report_heap_dumps +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106406 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385175 +milestone: '15.7' +type: ops group: group::application performance default_enabled: false diff --git a/config/feature_flags/ops/report_jemalloc_stats.yml b/config/feature_flags/ops/report_jemalloc_stats.yml index 9cf5fd9d14b..61fbfa26206 100644 --- a/config/feature_flags/ops/report_jemalloc_stats.yml +++ b/config/feature_flags/ops/report_jemalloc_stats.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91283 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367845 milestone: '15.2' type: ops -group: group::memory -default_enabled: true +group: group::application performance +default_enabled: false diff --git a/config/feature_flags/ops/purge_stale_security_findings.yml b/config/feature_flags/ops/search_curation_dry_run.yml index b540c8a1d60..37f5328ff13 100644 --- a/config/feature_flags/ops/purge_stale_security_findings.yml +++ b/config/feature_flags/ops/search_curation_dry_run.yml @@ -1,8 +1,8 @@ --- -name: purge_stale_security_findings -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81423 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356464 -milestone: '14.9' +name: search_curation_dry_run +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104321 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383003 +milestone: '15.7' type: ops -group: group::threat insights +group: group::global search default_enabled: true diff --git a/config/feature_flags/ops/search_index_curation_commits.yml b/config/feature_flags/ops/search_index_curation_commits.yml new file mode 100644 index 00000000000..4a25284e130 --- /dev/null +++ b/config/feature_flags/ops/search_index_curation_commits.yml @@ -0,0 +1,8 @@ +--- +name: search_index_curation_commits +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423" +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383093 +milestone: '15.7' +type: ops +group: group::global search +default_enabled: false diff --git a/config/feature_flags/ops/search_index_curation_issues.yml b/config/feature_flags/ops/search_index_curation_issues.yml new file mode 100644 index 00000000000..0a695a21796 --- /dev/null +++ b/config/feature_flags/ops/search_index_curation_issues.yml @@ -0,0 +1,8 @@ +--- +name: search_index_curation_issues +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423" +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383094 +milestone: '15.7' +type: ops +group: group::global search +default_enabled: false diff --git a/config/feature_flags/ops/search_index_curation_main_index.yml b/config/feature_flags/ops/search_index_curation_main_index.yml new file mode 100644 index 00000000000..7d767de89cd --- /dev/null +++ b/config/feature_flags/ops/search_index_curation_main_index.yml @@ -0,0 +1,8 @@ +--- +name: search_index_curation_main_index +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383106 +milestone: '15.7' +type: ops +group: group::global search +default_enabled: false diff --git a/config/feature_flags/ops/search_index_curation_merge_requests.yml b/config/feature_flags/ops/search_index_curation_merge_requests.yml new file mode 100644 index 00000000000..79dcb8be79d --- /dev/null +++ b/config/feature_flags/ops/search_index_curation_merge_requests.yml @@ -0,0 +1,8 @@ +--- +name: search_index_curation_merge_requests +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423" +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383095 +milestone: '15.7' +type: ops +group: group::global search +default_enabled: false diff --git a/config/feature_flags/ops/search_index_curation_notes.yml b/config/feature_flags/ops/search_index_curation_notes.yml new file mode 100644 index 00000000000..1bba280eb64 --- /dev/null +++ b/config/feature_flags/ops/search_index_curation_notes.yml @@ -0,0 +1,8 @@ +--- +name: search_index_curation_notes +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423" +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383096 +milestone: '15.7' +type: ops +group: group::global search +default_enabled: false diff --git a/config/feature_flags/ops/search_index_curation_users.yml b/config/feature_flags/ops/search_index_curation_users.yml new file mode 100644 index 00000000000..a5383df8ad7 --- /dev/null +++ b/config/feature_flags/ops/search_index_curation_users.yml @@ -0,0 +1,8 @@ +--- +name: search_index_curation_users +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423" +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383097 +milestone: '15.7' +type: ops +group: group::global search +default_enabled: false diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 732d46d284b..f67099fbdf0 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -482,6 +482,14 @@ production: &base enabled: false host: 'https://mattermost.example.com' + ## Jira connect + ## To switch to a Jira connect development environment + jira_connect: + # atlassian_js_url: 'http://localhost:9292/atlassian.js' + # enable_public_keys_storage: true + # enforce_jira_base_url_https: false + # additional_iframe_ancestors: ['localhost:*'] + ## Gravatar ## If using gravatar.com, there's nothing to change here. For Libravatar ## you'll need to provide the custom URLs. For more information, @@ -847,7 +855,7 @@ production: &base # Filter LDAP users # - # Format: RFC 4515 https://tools.ietf.org/search/rfc4515 + # Format: RFC 4515 https://www.rfc-editor.org/rfc/rfc4515 # Ex. (employeeType=developer) # # Note: GitLab does not support omniauth-ldap's custom filter syntax. @@ -1050,7 +1058,7 @@ production: &base # disable_ssl_verification: false, # login_url: '/cas/login', # service_validate_url: '/cas/p3/serviceValidate', - # logout_url: '/cas/logout'} } + # logout_url: '/cas/logout' } } # - { name: 'authentiq', # # for client credentials (client ID and secret), go to https://www.authentiq.com/developers # app_id: 'YOUR_CLIENT_ID', @@ -1559,7 +1567,7 @@ test: disable_ssl_verification: false, login_url: '/cas/login', service_validate_url: '/cas/p3/serviceValidate', - logout_url: '/cas/logout'} } + logout_url: '/cas/logout' } } - { name: 'github', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET', diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml index efb14cdea36..5212ffbfd6b 100644 --- a/config/gitlab_loose_foreign_keys.yml +++ b/config/gitlab_loose_foreign_keys.yml @@ -166,6 +166,10 @@ clusters_applications_runners: - table: ci_runners column: runner_id on_delete: async_nullify +dast_pre_scan_verifications: + - table: ci_pipelines + column: ci_pipeline_id + on_delete: async_delete dast_profiles_pipelines: - table: ci_pipelines column: ci_pipeline_id @@ -174,6 +178,10 @@ dast_scanner_profiles_builds: - table: ci_builds column: ci_build_id on_delete: async_delete +dast_scanner_profiles_tags: + - table: tags + column: tag_id + on_delete: async_delete dast_site_profiles_builds: - table: ci_builds column: ci_build_id diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/1_active_record_data_types.rb index 7f4bd32c221..ba4ca8b3b5c 100644 --- a/config/initializers/active_record_data_types.rb +++ b/config/initializers/1_active_record_data_types.rb @@ -5,7 +5,10 @@ require 'active_record/connection_adapters/postgresql_adapter' -module ActiveRecord::ConnectionAdapters::PostgreSQL::OID +ActiveRecord::Type.register(:ind_jsonb, Gitlab::Database::Type::IndifferentJsonb) +ActiveRecord::Type.register(:sym_jsonb, Gitlab::Database::Type::SymbolizedJsonb) + +module ActiveRecord::ConnectionAdapters::PostgreSQL::OID # rubocop:disable Style/ClassAndModuleChildren # Add the class `DateTimeWithTimeZone` so we can map `timestamptz` to it. class DateTimeWithTimeZone < DateTime def type @@ -34,7 +37,7 @@ module RegisterDateTimeWithTimeZone end end -class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter +class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter # rubocop:disable Style/ClassAndModuleChildren prepend RegisterDateTimeWithTimeZone # Add column type `datetime_with_timezone` so we can do this in @@ -52,6 +55,9 @@ rescue StandardError end # Ensure `datetime_with_timezone` columns are correctly written to schema.rb + +# rubocop:disable Database/MultipleDatabases ActiveRecord::Base.connection.send(:reload_type_map) if connection_active? ActiveRecord::Base.time_zone_aware_types += [:datetime_with_timezone] +# rubocop:enable Database/MultipleDatabases diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index da4277c8146..aafca0e2f09 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -221,7 +221,7 @@ Settings.gitlab['issue_closing_pattern'] = '\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab['webhook_timeout'] ||= 10 Settings.gitlab['graphql_timeout'] ||= 30 -Settings.gitlab['max_attachment_size'] ||= 10 +Settings.gitlab['max_attachment_size'] ||= 100 Settings.gitlab['session_expire_delay'] ||= 10080 Settings.gitlab['unauthenticated_session_expire_delay'] ||= 2.hours.to_i Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? @@ -440,6 +440,17 @@ Settings.mattermost['enabled'] = false if Settings.mattermost['enabled'].nil? Settings.mattermost['host'] = nil unless Settings.mattermost.enabled # +# Jira Connect (GitLab.com for Jira Cloud App) +# +Settings['jira_connect'] ||= Settingslogic.new({}) + +Settings.jira_connect['atlassian_js_url'] ||= 'https://connect-cdn.atl-paas.net/all.js' +Settings.jira_connect['enable_public_keys_storage'] ||= false +Settings.jira_connect['enable_public_keys_storage'] = true if Gitlab.com? +Settings.jira_connect['enforce_jira_base_url_https'] = true if Settings.jira_connect['enforce_jira_base_url_https'].nil? +Settings.jira_connect['additional_iframe_ancestors'] ||= [] + +# # Gravatar # Settings['gravatar'] ||= Settingslogic.new({}) @@ -515,6 +526,9 @@ Settings.cron_jobs['remove_unaccepted_member_invites_worker']['job_class'] = 'Re Settings.cron_jobs['prune_old_events_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '0 */6 * * *' Settings.cron_jobs['prune_old_events_worker']['job_class'] = 'PruneOldEventsWorker' +Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker']['cron'] ||= '30 3 * * */7' +Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker']['job_class'] = 'Gitlab::Export::PruneProjectExportJobsWorker' Settings.cron_jobs['trending_projects_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['trending_projects_worker']['cron'] = '0 1 * * *' Settings.cron_jobs['trending_projects_worker']['job_class'] = 'TrendingProjectsWorker' @@ -718,9 +732,6 @@ Gitlab.ee do Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker']['job_class'] ||= 'Geo::RepositoryVerification::Secondary::SchedulerWorker' - Settings.cron_jobs['geo_container_repository_sync_worker'] ||= Settingslogic.new({}) - Settings.cron_jobs['geo_container_repository_sync_worker']['cron'] ||= '*/1 * * * *' - Settings.cron_jobs['geo_container_repository_sync_worker']['job_class'] ||= 'Geo::ContainerRepositorySyncDispatchWorker' Settings.cron_jobs['historical_data_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['historical_data_worker']['cron'] ||= '0 12 * * *' Settings.cron_jobs['historical_data_worker']['job_class'] = 'HistoricalDataWorker' @@ -809,6 +820,9 @@ Gitlab.ee do Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= Settingslogic.new({}) Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects']['cron'] ||= "30 5 * * 0" Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects']['job_class'] = 'Projects::DisableLegacyOpenSourceLicenseForInactiveProjectsWorker' + Settings.cron_jobs['notify_seats_exceeded_batch_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['notify_seats_exceeded_batch_worker']['cron'] ||= '0 3 * * *' + Settings.cron_jobs['notify_seats_exceeded_batch_worker']['job_class'] ||= 'GitlabSubscriptions::NotifySeatsExceededBatchWorker' end end @@ -1041,6 +1055,12 @@ Settings.prometheus['enabled'] ||= false Settings.prometheus['server_address'] ||= nil # +# Bullet settings +# +Settings['bullet'] ||= Settingslogic.new({}) +Settings.bullet['enabled'] ||= Rails.env.development? + +# # Shutdown settings # Settings['shutdown'] ||= Settingslogic.new({}) diff --git a/config/initializers/countries.rb b/config/initializers/countries.rb index 52537b5d885..171c126143c 100644 --- a/config/initializers/countries.rb +++ b/config/initializers/countries.rb @@ -8,7 +8,7 @@ end # This overrides the display name for Ukraine to 'Ukraine (except the Crimea, Donetsk, and Luhansk regions)' # See: https://gitlab.com/gitlab-org/gitlab/-/issues/374946 # To be removed after https://gitlab.com/gitlab-org/gitlab/issues/14784 is implemented -# Data fetched is based on https://github.com/hexorx/countries/blob/master/lib/countries/data/countries/UA.yaml +# Data fetched is based on https://github.com/countries/countries/blob/master/lib/countries/data/countries/UA.yaml ISO3166::Data.register( continent: "Europe", address_format: "|- diff --git a/config/initializers/diagnostic_reports.rb b/config/initializers/diagnostic_reports.rb index 47266f99f2d..14bac060c25 100644 --- a/config/initializers/diagnostic_reports.rb +++ b/config/initializers/diagnostic_reports.rb @@ -7,3 +7,9 @@ return unless Gitlab::Runtime.puma? Gitlab::Cluster::LifecycleEvents.on_worker_start do Gitlab::Memory::ReportsDaemon.instance.start end + +Gitlab::Cluster::LifecycleEvents.on_worker_stop do + Gitlab::Memory::Reporter.new.run_report( + Gitlab::Memory::Reports::HeapDump.new + ) +end diff --git a/config/initializers/rest-client-hostname_override.rb b/config/initializers/rest-client-hostname_override.rb index bb8995a4659..2fb3b9fc27d 100644 --- a/config/initializers/rest-client-hostname_override.rb +++ b/config/initializers/rest-client-hostname_override.rb @@ -9,7 +9,8 @@ module RestClient begin ip, hostname_override = Gitlab::UrlBlocker.validate!(uri, allow_local_network: allow_settings_local_requests?, allow_localhost: allow_settings_local_requests?, - dns_rebind_protection: dns_rebind_protection?) + dns_rebind_protection: dns_rebind_protection?, + schemes: %w[http https]) self.hostname_override = hostname_override rescue Gitlab::UrlBlocker::BlockedUrlError => e diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 363438849ed..58441b83c7d 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -32,7 +32,8 @@ queues_config_hash = Gitlab::Redis::Queues.params queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE enable_json_logs = Gitlab.config.sidekiq.log_format == 'json' -enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero? +enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero? && + !Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED']) Sidekiq.configure_server do |config| config[:strict] = false diff --git a/config/initializers/types.rb b/config/initializers/types.rb deleted file mode 100644 index 4a20e257469..00000000000 --- a/config/initializers/types.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -ActiveRecord::Type.register(:sym_jsonb, Gitlab::Database::Type::SymbolizedJsonb) diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index ff3ae9a2467..8ee6a055535 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -24,6 +24,7 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d require_dependency 'gitlab/metrics/subscribers/action_view' require_dependency 'gitlab/metrics/subscribers/active_record' require_dependency 'gitlab/metrics/subscribers/rails_cache' + require_dependency 'gitlab/metrics/subscribers/ldap' Gitlab::Application.configure do |config| # We want to track certain metrics during the Load Balancing host resolving process. diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb index 795b0f20128..2bf98a38544 100644 --- a/config/initializers_before_autoloader/000_inflections.rb +++ b/config/initializers_before_autoloader/000_inflections.rb @@ -19,6 +19,7 @@ ActiveSupport::Inflector.inflections do |inflect| container_repository_registry dependency_proxy_blob_registry design_registry + dependency_proxy_manifest_registry event_log file_registry group_view diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml index e7eb6a01f82..90c053612cf 100644 --- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml @@ -132,6 +132,12 @@ options: - i_code_review_user_unresolve_thread - i_code_review_user_vs_code_api_request - i_code_review_widget_nothing_merge_click_new_file + - i_code_review_merge_request_widget_security_reports_expand + - i_code_review_merge_request_widget_security_reports_expand_failed + - i_code_review_merge_request_widget_security_reports_expand_success + - i_code_review_merge_request_widget_security_reports_expand_warning + - i_code_review_merge_request_widget_security_reports_full_report_clicked + - i_code_review_merge_request_widget_security_reports_view distribution: - ce - ee diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml index 554b5c57bb6..4b972a3315d 100755 --- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml @@ -94,6 +94,8 @@ options: - p_ci_templates_jobs_secret_detection_latest - p_ci_templates_jobs_code_intelligence - p_ci_templates_jobs_code_quality + - p_ci_templates_jobs_container_scanning + - p_ci_templates_jobs_container_scanning_latest - p_ci_templates_jobs_dependency_scanning - p_ci_templates_jobs_dependency_scanning_latest - p_ci_templates_jobs_license_scanning @@ -142,6 +144,7 @@ options: - p_ci_templates_implicit_jobs_secret_detection - p_ci_templates_implicit_jobs_code_intelligence - p_ci_templates_implicit_jobs_code_quality + - p_ci_templates_implicit_jobs_container_scanning - p_ci_templates_implicit_jobs_dependency_scanning - p_ci_templates_implicit_jobs_license_scanning - p_ci_templates_implicit_jobs_deploy_ecs diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml index 7b18f83973a..93be16fa2f4 100644 --- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml @@ -39,5 +39,4 @@ tier: performance_indicator_type: - gmau - paid_gmau -- smau milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml index 6f7b82ec793..8a0005a5c5c 100644 --- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml +++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml @@ -132,3 +132,9 @@ options: - 'i_code_review_merge_request_widget_license_compliance_expand_success' - 'i_code_review_merge_request_widget_license_compliance_expand_warning' - 'i_code_review_merge_request_widget_license_compliance_expand_failed' + - 'i_code_review_merge_request_widget_security_reports_view' + - 'i_code_review_merge_request_widget_security_reports_full_report_clicked' + - 'i_code_review_merge_request_widget_security_reports_expand' + - 'i_code_review_merge_request_widget_security_reports_expand_success' + - 'i_code_review_merge_request_widget_security_reports_expand_warning' + - 'i_code_review_merge_request_widget_security_reports_expand_failed' diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml index ce14aa19f9c..7ef2725f01c 100644 --- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml +++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml @@ -136,3 +136,9 @@ options: - 'i_code_review_merge_request_widget_license_compliance_expand_success' - 'i_code_review_merge_request_widget_license_compliance_expand_warning' - 'i_code_review_merge_request_widget_license_compliance_expand_failed' + - 'i_code_review_merge_request_widget_security_reports_view' + - 'i_code_review_merge_request_widget_security_reports_full_report_clicked' + - 'i_code_review_merge_request_widget_security_reports_expand' + - 'i_code_review_merge_request_widget_security_reports_expand_success' + - 'i_code_review_merge_request_widget_security_reports_expand_warning' + - 'i_code_review_merge_request_widget_security_reports_expand_failed' diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml new file mode 100644 index 00000000000..62ce68dd4e6 --- /dev/null +++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_container_scanning_monthly +description: Monthly counts for implicit use of Container Scanning CI template (Jobs folder) +product_section: sec +product_stage: secure +product_group: composition_analysis +product_category: container_scanning +value_type: number +status: active +milestone: '15.6' +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262" +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_container_scanning diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml new file mode 100644 index 00000000000..df169b9eb48 --- /dev/null +++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_latest_monthly +description: Monthly counts for Container Scanning CI Latest template (Jobs folder) +product_section: sec +product_stage: secure +product_group: composition_analysis +product_category: container_scanning +value_type: number +status: active +milestone: '15.6' +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262" +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_jobs_container_scanning_latest diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml new file mode 100644 index 00000000000..2abbb3f9b16 --- /dev/null +++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_monthly +description: Monthly counts for Container Scanning CI template (Jobs folder) +product_section: sec +product_stage: secure +product_group: composition_analysis +product_category: container_scanning +value_type: number +status: active +milestone: '15.6' +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262" +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_jobs_container_scanning diff --git a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml index 5987bde2d14..4e9d58bddad 100644 --- a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml +++ b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml @@ -6,9 +6,11 @@ product_stage: create product_group: code_review product_category: code_review value_type: number -status: active +status: removed milestone: "15.6" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103334 +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106449 +milestone_removed: "15.7" time_frame: 28d data_source: database data_category: optional diff --git a/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml b/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml new file mode 100644 index 00000000000..078da4a2768 --- /dev/null +++ b/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_view_monthly +description: The count of unique users (monthly) who were able to see the Security Reports widget extension +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_view +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml new file mode 100644 index 00000000000..2b520e995d2 --- /dev/null +++ b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_monthly +description: The count of unique users (monthly) who expanded the Security Reports widget extension +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml new file mode 100644 index 00000000000..e18744673e4 --- /dev/null +++ b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly +description: The count of unique users (monthly) who clicked the Full Report button on the Security Reports widget extension +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_full_report_clicked +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml b/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml new file mode 100644 index 00000000000..e604a3df3e6 --- /dev/null +++ b/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_success_monthly +description: The count of unique users (monthly) who expanded the Security Reports widget extension while it is in its Success state +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand_success +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml new file mode 100644 index 00000000000..f33f78961a9 --- /dev/null +++ b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_failed_monthly +description: The count of unique users (monthly) who expanded the Security Reports widget extension while it is in its Failed state +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand_failed +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml new file mode 100644 index 00000000000..28763d81c88 --- /dev/null +++ b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_warning_monthly +description: The count of unique users (monthly) who expanded the Security Reports widget extension while it is in its Warning state +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand_warning +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml new file mode 100644 index 00000000000..dca8545691a --- /dev/null +++ b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_create_mr_monthly +description: Count of unique merge requests created per month +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_create_mr +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml index 420926c825c..07985c3e56e 100644 --- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml +++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml @@ -132,6 +132,12 @@ options: - i_code_review_user_unresolve_thread - i_code_review_user_vs_code_api_request - i_code_review_widget_nothing_merge_click_new_file + - i_code_review_merge_request_widget_security_reports_expand + - i_code_review_merge_request_widget_security_reports_expand_failed + - i_code_review_merge_request_widget_security_reports_expand_success + - i_code_review_merge_request_widget_security_reports_expand_warning + - i_code_review_merge_request_widget_security_reports_full_report_clicked + - i_code_review_merge_request_widget_security_reports_view distribution: - ce - ee diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml index f3758f5bd06..029742453d8 100755 --- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml +++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml @@ -94,6 +94,8 @@ options: - p_ci_templates_jobs_secret_detection_latest - p_ci_templates_jobs_code_intelligence - p_ci_templates_jobs_code_quality + - p_ci_templates_jobs_container_scanning + - p_ci_templates_jobs_container_scanning_latest - p_ci_templates_jobs_dependency_scanning - p_ci_templates_jobs_dependency_scanning_latest - p_ci_templates_jobs_license_scanning @@ -142,6 +144,7 @@ options: - p_ci_templates_implicit_jobs_secret_detection - p_ci_templates_implicit_jobs_code_intelligence - p_ci_templates_implicit_jobs_code_quality + - p_ci_templates_implicit_jobs_container_scanning - p_ci_templates_implicit_jobs_dependency_scanning - p_ci_templates_implicit_jobs_license_scanning - p_ci_templates_implicit_jobs_deploy_ecs diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml index f29f4d0cf28..f9acb05be3e 100644 --- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml +++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml @@ -134,3 +134,9 @@ options: - 'i_code_review_merge_request_widget_license_compliance_expand_success' - 'i_code_review_merge_request_widget_license_compliance_expand_warning' - 'i_code_review_merge_request_widget_license_compliance_expand_failed' + - 'i_code_review_merge_request_widget_security_reports_view' + - 'i_code_review_merge_request_widget_security_reports_full_report_clicked' + - 'i_code_review_merge_request_widget_security_reports_expand' + - 'i_code_review_merge_request_widget_security_reports_expand_success' + - 'i_code_review_merge_request_widget_security_reports_expand_warning' + - 'i_code_review_merge_request_widget_security_reports_expand_failed' diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml index e40e7c7f19a..6ceeef68c21 100644 --- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml +++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml @@ -132,3 +132,9 @@ options: - 'i_code_review_merge_request_widget_license_compliance_expand_success' - 'i_code_review_merge_request_widget_license_compliance_expand_warning' - 'i_code_review_merge_request_widget_license_compliance_expand_failed' + - 'i_code_review_merge_request_widget_security_reports_view' + - 'i_code_review_merge_request_widget_security_reports_full_report_clicked' + - 'i_code_review_merge_request_widget_security_reports_expand' + - 'i_code_review_merge_request_widget_security_reports_expand_success' + - 'i_code_review_merge_request_widget_security_reports_expand_warning' + - 'i_code_review_merge_request_widget_security_reports_expand_failed' diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml new file mode 100644 index 00000000000..8c081dd8a77 --- /dev/null +++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_container_scanning_weekly +description: Weekly counts for implicit use of Container Scanning CI template (Jobs folder) +product_section: sec +product_stage: secure +product_group: composition_analysis +product_category: container_scanning +value_type: number +status: active +milestone: '15.6' +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262" +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_container_scanning diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml new file mode 100644 index 00000000000..7535ebc57a2 --- /dev/null +++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_latest_weekly +description: Weekly counts for Container Scanning CI Latest template (Jobs folder) +product_section: sec +product_stage: secure +product_group: composition_analysis +product_category: container_scanning +value_type: number +status: active +milestone: '15.6' +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262" +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_jobs_container_scanning_latest diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml new file mode 100644 index 00000000000..4f79b514af5 --- /dev/null +++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_weekly +description: Weekly counts for Container Scanning CI template (Jobs folder) +product_section: sec +product_stage: secure +product_group: composition_analysis +product_category: container_scanning +value_type: number +status: active +milestone: '15.6' +introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262" +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_jobs_container_scanning diff --git a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml new file mode 100644 index 00000000000..751337d22d3 --- /dev/null +++ b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_view_weekly +description: The count of unique users (weekly) who were able to see the Security Reports widget extension +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_view +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml new file mode 100644 index 00000000000..1f123bb8c68 --- /dev/null +++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_weekly +description: The count of unique users (weekly) who expanded the Security Reports widget extension +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml new file mode 100644 index 00000000000..925b2730c2c --- /dev/null +++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly +description: The count of unique users (weekly) who clicked the Full Report button on the Security Reports widget extension +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_full_report_clicked +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml new file mode 100644 index 00000000000..84163e934cb --- /dev/null +++ b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_success_weekly +description: The count of unique users (weekly) who expanded the Security Reports widget extension while it is in its Success state +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand_success +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml new file mode 100644 index 00000000000..b5729bc1ec9 --- /dev/null +++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_failed_weekly +description: The count of unique users (weekly) who expanded the Security Reports widget extension while it is in its Failed state +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand_failed +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml new file mode 100644 index 00000000000..061b3a0fb30 --- /dev/null +++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_warning_weekly +description: The count of unique users (weekly) who expanded the Security Reports widget extension while it is in its Warning state +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_merge_request_widget_security_reports_expand_warning +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml new file mode 100644 index 00000000000..43405d5bd2c --- /dev/null +++ b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_create_mr_weekly +description: Count of unique merge requests created per week +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +performance_indicator_type: [] +options: + events: + - i_code_review_create_mr +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml index bd756b8bcef..7e5f41d54f5 100644 --- a/config/metrics/counts_all/20210204124930_servers.yml +++ b/config/metrics/counts_all/20210204124930_servers.yml @@ -9,7 +9,7 @@ product_category: gitaly value_type: number status: active time_frame: all -data_source: database +data_source: system distribution: - ce - ee diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml index 6f7524c8765..0e37a6c19b5 100644 --- a/config/metrics/counts_all/20210204124932_clusters.yml +++ b/config/metrics/counts_all/20210204124932_clusters.yml @@ -9,7 +9,7 @@ product_category: gitaly value_type: number status: active time_frame: all -data_source: database +data_source: system distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml index 46db9f97e85..b88351eb4dc 100644 --- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml @@ -7,7 +7,9 @@ product_stage: manage product_group: integrations product_category: integrations value_type: number -status: active +status: removed +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394 +milestone_removed: '15.7' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml index d5da36978b6..f77fe5ec728 100644 --- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml @@ -7,7 +7,9 @@ product_stage: manage product_group: integrations product_category: integrations value_type: number -status: active +status: removed +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394 +milestone_removed: '15.7' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml index 198af43a99d..f22e6e6bc77 100644 --- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml @@ -7,7 +7,9 @@ product_stage: manage product_group: integrations product_category: integrations value_type: number -status: active +status: removed +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394 +milestone_removed: '15.7' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml index f094f894ded..a291191eaeb 100644 --- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml @@ -7,7 +7,9 @@ product_stage: manage product_group: integrations product_category: integrations value_type: number -status: active +status: removed +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394 +milestone_removed: '15.7' time_frame: all data_source: database distribution: 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 fb7931ddf09..c3c4a01a809 100644 --- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml @@ -7,7 +7,9 @@ product_stage: manage product_group: integrations product_category: integrations value_type: number -status: active +status: removed +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394 +milestone_removed: '15.7' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml index bf1a98fd290..22c6c6b7833 100644 --- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml +++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml @@ -11,6 +11,10 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric +options: + enabled: true + older_than: 7d distribution: - ee - ce diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml index 31f7f6562e4..e4094c25594 100644 --- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml +++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml @@ -11,6 +11,10 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric +options: + enabled: true + older_than: 14d distribution: - ee - ce diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml index 577e9e60d56..11e7b1ebef5 100644 --- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml +++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml @@ -11,6 +11,10 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric +options: + enabled: true + older_than: 30d distribution: - ee - ce diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml index 3ef97b5a6f8..987bffdcef8 100644 --- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml +++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml @@ -11,6 +11,10 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric +options: + enabled: true + older_than: 90d distribution: - ee - ce diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml index d2be783a12a..a4cfecc228b 100644 --- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml +++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml @@ -11,6 +11,10 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric +options: + enabled: true + older_than: null distribution: - ee - ce diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml index 3ea154f5877..ecc9cf97b4d 100644 --- a/config/metrics/counts_all/20210216181051_vendor.yml +++ b/config/metrics/counts_all/20210216181051_vendor.yml @@ -10,7 +10,7 @@ product_category: container registry value_type: number status: active time_frame: all -data_source: database +data_source: system distribution: - ee - ce diff --git a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml index 276b1c97e0c..bd00db71abb 100644 --- a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml +++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml @@ -11,6 +11,10 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric +options: + enabled: true + older_than: 60d distribution: - ee - ce diff --git a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml new file mode 100644 index 00000000000..4c17bd746b3 --- /dev/null +++ b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml @@ -0,0 +1,26 @@ +--- +key_path: counts.i_code_review_merge_request_widget_security_reports_count_view +description: Total number of times the Security Reports widget extension was viewed (rendered to the screen) +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: all +data_source: redis +data_category: optional +instrumentation_class: MergeRequestWidgetExtensionMetric +performance_indicator_type: [] +options: + event: view + widget: security_reports +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml new file mode 100644 index 00000000000..60b6b75d064 --- /dev/null +++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml @@ -0,0 +1,26 @@ +--- +key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand +description: Total number of times the Security Reports widget extension was expanded (in any state) +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: all +data_source: redis +data_category: optional +instrumentation_class: MergeRequestWidgetExtensionMetric +performance_indicator_type: [] +options: + event: expand + widget: security_reports +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml new file mode 100644 index 00000000000..f5fef7e7cbe --- /dev/null +++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml @@ -0,0 +1,26 @@ +--- +key_path: counts.i_code_review_merge_request_widget_security_reports_count_full_report_clicked +description: Total number of times the Security Reports widget extension Full Report button was clicked +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: all +data_source: redis +data_category: optional +instrumentation_class: MergeRequestWidgetExtensionMetric +performance_indicator_type: [] +options: + event: full_report_clicked + widget: security_reports +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml new file mode 100644 index 00000000000..fa0b573be84 --- /dev/null +++ b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml @@ -0,0 +1,26 @@ +--- +key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_success +description: Total number of times the Security Reports widget extension was expanded (while in its Success state) +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: all +data_source: redis +data_category: optional +instrumentation_class: MergeRequestWidgetExtensionMetric +performance_indicator_type: [] +options: + event: expand_success + widget: security_reports +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml new file mode 100644 index 00000000000..20e21862a9a --- /dev/null +++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml @@ -0,0 +1,26 @@ +--- +key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_failed +description: Total number of times the Security Reports widget extension was expanded (while in its Failed state) +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: all +data_source: redis +data_category: optional +instrumentation_class: MergeRequestWidgetExtensionMetric +performance_indicator_type: [] +options: + event: expand_failed + widget: security_reports +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml new file mode 100644 index 00000000000..7a917d85b9c --- /dev/null +++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml @@ -0,0 +1,26 @@ +--- +key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_warning +description: Total number of times the Security Reports widget extension was expanded (while in its Warning state) +product_section: dev +product_stage: create +product_group: code_review +product_category: code_review +value_type: number +status: active +milestone: "15.7" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578 +time_frame: all +data_source: redis +data_category: optional +instrumentation_class: MergeRequestWidgetExtensionMetric +performance_indicator_type: [] +options: + event: expand_warning + widget: security_reports +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml index 24637178a2a..493c93d3d1a 100644 --- a/config/metrics/settings/20210216175609_version.yml +++ b/config/metrics/settings/20210216175609_version.yml @@ -9,7 +9,7 @@ product_category: collection value_type: string status: active time_frame: none -data_source: database +data_source: system distribution: - ce - ee diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml index 73ba2dd01fd..fc12cc8803f 100644 --- a/config/metrics/settings/20210216180314_gitpod_enabled.yml +++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml @@ -9,7 +9,7 @@ product_category: integrations value_type: boolean status: active time_frame: none -data_source: database +data_source: system distribution: - ce - ee diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml index e9d9d475b06..22f7e5e078d 100644 --- a/config/metrics/settings/20210216180841_background_upload.yml +++ b/config/metrics/settings/20210216180841_background_upload.yml @@ -7,7 +7,8 @@ product_stage: enablement product_group: memory product_category: memory value_type: boolean -status: active +status: broken +repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900 time_frame: none data_source: system distribution: diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml index b7a0d328b8b..21536e35303 100644 --- a/config/metrics/settings/20210216180851_background_upload.yml +++ b/config/metrics/settings/20210216180851_background_upload.yml @@ -8,7 +8,8 @@ product_stage: enablement product_group: memory product_category: memory value_type: boolean -status: active +status: broken +repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900 time_frame: none data_source: system distribution: diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml index ed6931dd443..df93b11c656 100644 --- a/config/metrics/settings/20210216180900_background_upload.yml +++ b/config/metrics/settings/20210216180900_background_upload.yml @@ -7,7 +7,8 @@ product_stage: enablement product_group: memory product_category: memory value_type: boolean -status: active +status: broken +repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900 time_frame: none data_source: system distribution: diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml index c18a22d1634..32871d5d30e 100644 --- a/config/metrics/settings/20210216180909_background_upload.yml +++ b/config/metrics/settings/20210216180909_background_upload.yml @@ -7,7 +7,8 @@ product_stage: enablement product_group: memory product_category: memory value_type: boolean -status: active +status: broken +repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900 time_frame: none data_source: system distribution: diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml index 940273ff972..186e7c8b2b9 100644 --- a/config/metrics/settings/20210216180918_background_upload.yml +++ b/config/metrics/settings/20210216180918_background_upload.yml @@ -7,7 +7,8 @@ product_stage: enablement product_group: memory product_category: memory value_type: boolean -status: active +status: broken +repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900 time_frame: none data_source: system distribution: diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb index 173ce5a5982..3fc24dab3d7 100644 --- a/config/object_store_settings.rb +++ b/config/object_store_settings.rb @@ -27,7 +27,6 @@ class ObjectStoreSettings ) object_store['direct_upload'] = true - object_store['background_upload'] = false object_store['proxy_download'] = false if object_store['proxy_download'].nil? object_store['storage_options'] ||= {} @@ -97,7 +96,6 @@ class ObjectStoreSettings # "server_side_encryption" => "AES256" # }, # "direct_upload" => true, - # "background_upload" => false, # "proxy_download" => false, # "remote_directory" => "artifacts" # } @@ -116,7 +114,6 @@ class ObjectStoreSettings # "server_side_encryption" => "AES256" # }, # "direct_upload" => true, - # "background_upload" => false, # "proxy_download" => true, # "remote_directory" => "lfs-objects" # } @@ -128,7 +125,7 @@ class ObjectStoreSettings # 2. However, a bucket has to be specified for each object # type. Reusing buckets is not really supported, but we don't # enforce that yet. - # 3. direct_upload and background_upload cannot be configured anymore. + # 3. direct_upload cannot be configured anymore. def parse! return unless use_consolidated_settings? @@ -138,7 +135,6 @@ class ObjectStoreSettings common_config['connection']&.deep_stringify_keys! # These are no longer configurable if common config is used common_config['direct_upload'] = true - common_config['background_upload'] = false common_config['storage_options'] ||= {} SUPPORTED_TYPES.each do |store_type| diff --git a/config/open_api.yml b/config/open_api.yml index 6e767f51ef8..cbf70c24ce1 100644 --- a/config/open_api.yml +++ b/config/open_api.yml @@ -27,10 +27,20 @@ metadata: description: Operations related to the GitLab agent for Kubernetes - name: clusters description: Operations related to clusters + - name: composer_packages + description: Operations related to Composer packages + - name: conan_packages + description: Operations related to Conan packages - name: container_registry description: Operations related to container registry + - name: container_registry_event + description: Operations related to container registry events - name: dashboard_annotations description: Operations related to dashboard annotations + - name: debian_distribution + description: Operations related to Debian Linux distributions + - name: debian_packages + description: Operations related to Debian Linux packages - name: dependency_proxy description: Operations to manage dependency proxy for a groups - name: deploy_keys @@ -55,6 +65,8 @@ metadata: description: Operations related to managing Flipper-based feature flags - name: freeze_periods description: Operations related to deploy freeze periods + - name: generic_packages + description: Operations related to Generic packages - name: geo description: Operations related to Geo - name: geo_nodes @@ -67,16 +79,26 @@ metadata: description: Operations related to importing groups - name: group_packages description: Operations related to group packages + - name: helm_packages + description: Operations related to Helm packages - name: integrations description: Operations related to integrations - name: issue_links description: Operations related to issue links + - name: jira_connect_subscriptions + description: Operations related to JiraConnect subscriptions + - name: maven_packages + description: Operations related to Maven packages - name: merge_requests description: Operations related to merge requests - name: metadata description: Operations related to metadata of the GitLab instance - name: metrics_user_starred_dashboards description: Operations related to User-starred metrics dashboards + - name: npm_packages + description: Operations related to NPM packages + - name: nuget_packages + description: Operations related to Nuget packages - name: package_files description: Operations about package files - name: plan_limits @@ -91,14 +113,24 @@ metadata: description: Operations related to importing BitBucket projects - name: project_import_github description: Operations related to importing GitHub projects + - name: project_packages + description: Operations related to project packages + - name: projects + description: Operations related to projects - name: protected environments description: Operations related to protected environments + - name: pypi_packages + description: Operations related to PyPI packages - name: release_links description: Operations related to release assets (links) - name: releases description: Operations related to releases - name: resource_milestone_events description: Operations about resource milestone events + - name: rpm_packages + description: Operations related to RPM packages + - name: rubygem_packages + description: Operations related to RubyGems - name: suggestions description: Operations related to suggestions - name: system_hooks diff --git a/config/routes.rb b/config/routes.rb index 27313854233..a9cb462b326 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -55,9 +55,9 @@ InitializerConnections.with_disabled_database_connections do match '/oauth/token' => 'oauth/tokens#create', via: :options match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options - match '/-/jira_connect/oauth_application_id' => 'jira_connect/cors_preflight_checks#index', via: :options - match '/-/jira_connect/subscriptions/:id' => 'jira_connect/cors_preflight_checks#index', via: :options - match '/-/jira_connect/installations' => 'jira_connect/cors_preflight_checks#index', via: :options + match '/-/jira_connect/oauth_application_id' => 'jira_connect/oauth_application_ids#show', via: :options + match '/-/jira_connect/subscriptions(.:format)' => 'jira_connect/subscriptions#index', via: :options + match '/-/jira_connect/subscriptions/:id' => 'jira_connect/subscriptions#delete', via: :options # Sign up scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do @@ -155,6 +155,12 @@ InitializerConnections.with_disabled_database_connections do get '/merge_requests/:merge_request_id', to: 'ide#index', constraints: { merge_request_id: /\d+/ } get '/', to: 'ide#index' end + + # Remote host can contain "." characters so it needs a constraint + post 'remote/:remote_host(/*remote_path)', + as: :remote, + to: 'web_ide/remote_ide#index', + constraints: { remote_host: %r{[^/?]+} } end draw :operations diff --git a/config/routes/group.rb b/config/routes/group.rb index a715596580d..819db0bb6b1 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -61,6 +61,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resource :packages_and_registries, only: [:show] end + resources :usage_quotas, only: [:index] + resource :variables, only: [:show, :update] resources :children, only: [:index] diff --git a/config/routes/merge_requests.rb b/config/routes/merge_requests.rb index b0bab1717a6..29e0d65b58c 100644 --- a/config/routes/merge_requests.rb +++ b/config/routes/merge_requests.rb @@ -34,7 +34,7 @@ resources :merge_requests, concerns: :awardable, except: [:new, :create, :show], scope action: :show do get :commits, defaults: { tab: 'commits' } get :pipelines, defaults: { tab: 'pipelines' } - get :diffs, defaults: { tab: 'diffs' } + get :diffs, to: 'merge_requests#diffs', defaults: { tab: 'diffs' } end get :diff_for_path, controller: 'merge_requests/diffs' @@ -78,6 +78,7 @@ scope path: 'merge_requests', controller: 'merge_requests/creations' do scope constraints: ->(req) { req.format == :json }, as: :json do get :diffs get :pipelines + get :target_projects end scope action: :new do diff --git a/config/routes/project.rb b/config/routes/project.rb index 5a85a029607..798829484da 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -475,6 +475,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do namespace :ml do resources :experiments, only: [:index, :show], controller: 'experiments' + resources :candidates, only: [:show], controller: 'candidates', param: :iid end end # End of the /-/ scope. diff --git a/config/routes/user.rb b/config/routes/user.rb index 0c1bc1956a9..1c122ea0c94 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -55,6 +55,22 @@ devise_scope :user do get '/users/almost_there' => 'confirmations#almost_there' post '/users/resend_verification_code', to: 'sessions#resend_verification_code' get '/users/successful_verification', to: 'sessions#successful_verification' + + # Redirect on GitHub authorization request errors. E.g. it could happen when user: + # 1. cancel authorization the GitLab OAuth app via GitHub to import GitHub repos + # (they'll be redirected to /projects/new#import_project) + # 2. cancel signing in to GitLab using GitHub account + # (they'll be redirected to /users/sign_in) + # In these cases, GitHub redirects user to the GitLab OAuth app's + # registered callback URL - /users/auth, which is the url to the auth user's profile page + get '/users/auth', + constraints: ->(req) { + req.params[:error].present? && req.params[:state].present? + }, + to: redirect { |_params, req| + redirect_path = req.session.delete(:auth_on_failure_path) + redirect_path || Rails.application.routes.url_helpers.new_user_session_path + } end scope '-/users', module: :users do diff --git a/config/settings.rb b/config/settings.rb index 51d54817646..34acb09b9ed 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -42,12 +42,10 @@ class Settings < Settingslogic if gitlab_shell.ssh_port != 22 "ssh://#{user_host}:#{gitlab_shell.ssh_port}/" + elsif gitlab_shell.ssh_host.include? ':' + "[#{user_host}]:" else - if gitlab_shell.ssh_host.include? ':' - "[#{user_host}]:" - else - "#{user_host}:" - end + "#{user_host}:" end end diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 4ed4dca8912..929df749422 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -71,6 +71,8 @@ - 1 - - background_migration_ci_database - 1 +- - batched_background_migrations + - 1 - - bulk_import - 1 - - bulk_imports_entity @@ -129,6 +131,10 @@ - 1 - - delete_user - 1 +- - dependencies_destroy_export + - 1 +- - dependencies_export + - 1 - - dependency_proxy - 1 - - dependency_proxy_blob @@ -193,6 +199,8 @@ - 1 - - geo - 1 +- - github_gists_importer + - 1 - - github_import_advance_stage - 1 - - github_importer @@ -259,8 +267,6 @@ - 1 - - integrations_slack_event - 1 -- - integrations_slack_interactivity - - 1 - - invalid_gpg_signature_update - 2 - - issuable_export_csv @@ -295,14 +301,14 @@ - 1 - - merge_request_reset_approvals - 1 +- - merge_requests_capture_suggested_reviewers_accepted + - 1 - - merge_requests_close_issue - 1 - - merge_requests_create_approval_event - 1 - - merge_requests_create_approval_note - 1 -- - merge_requests_delete_branch - - 1 - - merge_requests_delete_source_branch - 1 - - merge_requests_execute_approval_hooks @@ -401,8 +407,12 @@ - 1 - - projects_after_import - 1 +- - projects_delete_branch + - 1 - - projects_git_garbage_collect - 1 +- - projects_import_export_parallel_project_export + - 1 - - projects_import_export_relation_export - 1 - - projects_inactive_projects_deletion_notification @@ -431,6 +441,8 @@ - 1 - - propagate_integration_project - 1 +- - pull_mirrors_reenable_configuration + - 1 - - reactive_caching - 1 - - rebase diff --git a/config/webpack.config.js b/config/webpack.config.js index d79e6e12b39..a0c65ed4012 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -160,6 +160,7 @@ function generateEntries() { */ const manualEntries = { default: defaultEntries, + legacy_sentry: './sentry/legacy_index.js', sentry: './sentry/index.js', performance_bar: './performance_bar/index.js', jira_connect_app: './jira_connect/subscriptions/index.js', @@ -174,6 +175,11 @@ function generateEntries() { const alias = { // Map Apollo client to apollo/client/core to prevent react related imports from being loaded '@apollo/client$': '@apollo/client/core', + // Map Sentry calls to use local wrapper + '@sentry/browser$': path.join( + ROOT_PATH, + 'app/assets/javascripts/sentry/sentry_browser_wrapper.js', + ), '~': path.join(ROOT_PATH, 'app/assets/javascripts'), emojis: path.join(ROOT_PATH, 'fixtures/emojis'), empty_states: path.join(ROOT_PATH, 'app/views/shared/empty_states'), @@ -378,6 +384,7 @@ module.exports = { }, { test: /_worker\.js$/, + resourceQuery: /worker/, use: [ { loader: 'worker-loader', @@ -429,6 +436,7 @@ module.exports = { }, { test: /\.(yml|yaml)$/, + resourceQuery: /raw/, loader: 'raw-loader', }, ].filter(Boolean), |