From 2eb24e8b4385eafaab66aa1f1f256ec8bf548a4b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 28 Jan 2025 18:40:06 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../gitlab/feature_flag_without_actor.yml | 4 - .rubocop_todo/gitlab/strong_memoize_attr.yml | 1 - .rubocop_todo/layout/array_alignment.yml | 1 - .rubocop_todo/layout/line_length.yml | 2 - .rubocop_todo/rails/pluck.yml | 2 - .rubocop_todo/rails/time_zone.yml | 1 - .rubocop_todo/rspec/contain_exactly.yml | 1 - .rubocop_todo/rspec/context_wording.yml | 2 - .rubocop_todo/rspec/named_subject.yml | 2 - .rubocop_todo/rspec/receive_messages.yml | 2 - .rubocop_todo/search/namespaced_class.yml | 1 - .rubocop_todo/style/if_unless_modifier.yml | 1 - .../style/inline_disable_annotation.yml | 2 - GITALY_SERVER_VERSION | 2 +- .../components/pipeline_url.vue | 13 +- .../ci/pipelines_page/components/time_ago.vue | 10 +- .../configure_feature_flags_modal.vue | 2 +- .../index/components/integrations_table.vue | 78 ++++-- .../multiple_choice_selector_item.vue | 2 +- .../single_choice_selector_item.vue | 2 +- .../notes/work_item_comment_form.vue | 5 +- .../components/multiple_choice_selector.scss | 7 +- app/assets/stylesheets/framework/images.scss | 12 +- app/controllers/concerns/wiki_actions.rb | 2 +- app/controllers/groups_controller.rb | 6 + .../projects/merge_requests_controller.rb | 6 + app/finders/todos_finder.rb | 33 +-- app/graphql/types/ci/detailed_status_type.rb | 3 +- .../ci/pipeline_creation/request_type.rb | 27 +++ .../types/ci/pipeline_creation/status_enum.rb | 17 ++ app/graphql/types/project_type.rb | 13 + app/models/todo.rb | 20 ++ .../settings/integrations/_form.html.haml | 4 +- ...ge_request_merge_checks_settings.html.haml | 8 +- ...ge_request_merge_commit_template.html.haml | 6 +- ...ge_request_merge_method_settings.html.haml | 7 +- ...e_request_merge_options_settings.html.haml | 8 +- ...quest_merge_suggestions_settings.html.haml | 6 +- ...e_request_squash_commit_template.html.haml | 6 +- ..._request_squash_options_settings.html.haml | 7 +- ..._request_target_project_settings.html.haml | 7 +- app/views/shared/integrations/edit.html.haml | 2 +- .../beta/snoozed_todos_sort_order.yml | 9 + .../development/search_index_curation.yml | 8 - .../ops/search_curation_dry_run.yml | 8 - .../ops/search_index_curation_commits.yml | 8 - .../ops/search_index_curation_epics.yml | 8 - .../ops/search_index_curation_issues.yml | 8 - .../ops/search_index_curation_main_index.yml | 8 - .../search_index_curation_merge_requests.yml | 8 - .../ops/search_index_curation_notes.yml | 8 - .../ops/search_index_curation_projects.yml | 8 - .../ops/search_index_curation_users.yml | 8 - .../ops/search_index_curation_wikis.yml | 8 - config/initializers/1_settings.rb | 3 - ...ecation-legacy-geo-prometheus-metrics.yml} | 4 +- doc/administration/cells.md | 60 +++++ doc/api/graphql/reference/index.md | 40 ++++ doc/development/cells/configuration.md | 15 ++ doc/development/work_items_widgets.md | 12 +- doc/update/deprecations.md | 2 +- .../protected_container_tags.md | 108 +++++++++ .../reduce_container_registry_storage.md | 1 + doc/user/project/pages/index.md | 6 +- .../helpers/personal_access_tokens_helpers.rb | 12 +- .../migration_helpers/work_items/widgets.rb | 44 +++- locale/gitlab.pot | 6 + .../release_with_glab_spec.rb | 226 ++++++++++++++++++ spec/controllers/groups_controller_spec.rb | 28 ++- .../merge_requests_controller_spec.rb | 102 ++++---- spec/finders/todos_finder_spec.rb | 56 +++-- .../components/integrations_table_spec.js | 25 +- .../notes/work_item_comment_form_spec.js | 26 +- spec/graphql/resolvers/todos_resolver_spec.rb | 2 +- .../ci/pipeline_creation/request_type_spec.rb | 9 + .../ci/pipeline_creation/status_enum_spec.rb | 9 + spec/graphql/types/project_type_spec.rb | 2 +- .../work_items/widgets_spec.rb | 142 +++++++---- spec/models/todo_spec.rb | 18 ++ .../ci/pipeline_creation/request_spec.rb | 56 +++++ .../api/personal_access_tokens_spec.rb | 20 ++ .../add_work_item_widget_shared_examples.rb | 54 +++-- 82 files changed, 1157 insertions(+), 371 deletions(-) create mode 100644 app/graphql/types/ci/pipeline_creation/request_type.rb create mode 100644 app/graphql/types/ci/pipeline_creation/status_enum.rb create mode 100644 config/feature_flags/beta/snoozed_todos_sort_order.yml delete mode 100644 config/feature_flags/development/search_index_curation.yml delete mode 100644 config/feature_flags/ops/search_curation_dry_run.yml delete mode 100644 config/feature_flags/ops/search_index_curation_commits.yml delete mode 100644 config/feature_flags/ops/search_index_curation_epics.yml delete mode 100644 config/feature_flags/ops/search_index_curation_issues.yml delete mode 100644 config/feature_flags/ops/search_index_curation_main_index.yml delete mode 100644 config/feature_flags/ops/search_index_curation_merge_requests.yml delete mode 100644 config/feature_flags/ops/search_index_curation_notes.yml delete mode 100644 config/feature_flags/ops/search_index_curation_projects.yml delete mode 100644 config/feature_flags/ops/search_index_curation_users.yml delete mode 100644 config/feature_flags/ops/search_index_curation_wikis.yml rename data/deprecations/{17-4-deprecation-legacy-geo-prometheus-metrics.yml => 17-9-deprecation-legacy-geo-prometheus-metrics.yml} (95%) create mode 100644 doc/administration/cells.md create mode 100644 doc/development/cells/configuration.md create mode 100644 doc/user/packages/container_registry/protected_container_tags.md create mode 100644 qa/qa/specs/features/browser_ui/4_verify/ci_components_catalog/release_with_glab_spec.rb create mode 100644 spec/graphql/types/ci/pipeline_creation/request_type_spec.rb create mode 100644 spec/graphql/types/ci/pipeline_creation/status_enum_spec.rb create mode 100644 spec/requests/api/graphql/project/ci/pipeline_creation/request_spec.rb diff --git a/.rubocop_todo/gitlab/feature_flag_without_actor.yml b/.rubocop_todo/gitlab/feature_flag_without_actor.yml index 24d011a518b..6504b975163 100644 --- a/.rubocop_todo/gitlab/feature_flag_without_actor.yml +++ b/.rubocop_todo/gitlab/feature_flag_without_actor.yml @@ -106,7 +106,6 @@ Gitlab/FeatureFlagWithoutActor: - 'ee/app/views/admin/geo/shared/_replication_nav.haml' - 'ee/app/views/projects/on_demand_scans/index.html.haml' - 'ee/app/views/projects/settings/merge_requests/_merge_trains_settings.html.haml' - - 'ee/app/workers/search/index_curation_worker.rb' - 'ee/lib/api/code_suggestions.rb' - 'ee/lib/api/internal/search/zoekt.rb' - 'ee/lib/api/internal/suggested_reviewers.rb' @@ -117,13 +116,10 @@ Gitlab/FeatureFlagWithoutActor: - 'ee/lib/ee/gitlab/auth/saml/config.rb' - 'ee/lib/ee/gitlab/geo_git_access.rb' - 'ee/lib/ee/gitlab/git_access.rb' - - 'ee/lib/gitlab/elastic/bulk_indexer.rb' - 'ee/lib/gitlab/elastic/client.rb' - - 'ee/lib/gitlab/elastic/indexer.rb' - 'ee/lib/gitlab/geo/replication/blob_downloader.rb' - 'ee/lib/gitlab/geo/replicator.rb' - 'ee/lib/gitlab/llm/tanuki_bot.rb' - - 'ee/lib/gitlab/search/index_curator.rb' - 'ee/lib/gitlab/search/zoekt/client.rb' - 'ee/lib/gitlab/usage_data_counters/epic_activity_unique_counter.rb' - 'ee/lib/gitlab_subscriptions/billable_users_utils.rb' diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml index d0c1114de69..d27f1f152fa 100644 --- a/.rubocop_todo/gitlab/strong_memoize_attr.yml +++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml @@ -372,7 +372,6 @@ Gitlab/StrongMemoizeAttr: - 'ee/lib/gitlab/ci/reports/metrics/reports_comparer.rb' - 'ee/lib/gitlab/code_owners/loader.rb' - 'ee/lib/gitlab/custom_file_templates.rb' - - 'ee/lib/gitlab/elastic/indexer.rb' - 'ee/lib/gitlab/elastic/project_search_results.rb' - 'ee/lib/gitlab/expiring_subscription_message.rb' - 'ee/lib/gitlab/geo/health_check.rb' diff --git a/.rubocop_todo/layout/array_alignment.yml b/.rubocop_todo/layout/array_alignment.yml index b922106e98f..666840f879d 100644 --- a/.rubocop_todo/layout/array_alignment.yml +++ b/.rubocop_todo/layout/array_alignment.yml @@ -35,7 +35,6 @@ Layout/ArrayAlignment: - 'ee/spec/graphql/resolvers/analytics/contribution_analytics/contributions_resolver_spec.rb' - 'ee/spec/graphql/types/dast_scanner_profile_type_spec.rb' - 'ee/spec/lib/gitlab/graphql/loaders/oncall_participant_loader_spec.rb' - - 'ee/spec/lib/gitlab/search/index_curator_spec.rb' - 'ee/spec/lib/gitlab/visibility_level_spec.rb' - 'ee/spec/lib/incident_management/oncall_shift_generator_spec.rb' - 'ee/spec/models/dora/base_metric_spec.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 99733e1756c..63916ad297a 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -1300,9 +1300,7 @@ Layout/LineLength: - 'ee/spec/lib/gitlab/code_owners_spec.rb' - 'ee/spec/lib/gitlab/custom_file_templates_spec.rb' - 'ee/spec/lib/gitlab/data_builder/vulnerability_spec.rb' - - 'ee/spec/lib/gitlab/elastic/bulk_indexer_spec.rb' - 'ee/spec/lib/gitlab/elastic/group_search_results_spec.rb' - - 'ee/spec/lib/gitlab/elastic/indexer_spec.rb' - 'ee/spec/lib/gitlab/elastic/snippet_search_results_spec.rb' - 'ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb' - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb' diff --git a/.rubocop_todo/rails/pluck.yml b/.rubocop_todo/rails/pluck.yml index 61cbcf06a6b..43640241681 100644 --- a/.rubocop_todo/rails/pluck.yml +++ b/.rubocop_todo/rails/pluck.yml @@ -24,7 +24,6 @@ Rails/Pluck: - 'ee/lib/banzai/filter/references/iteration_reference_filter.rb' - 'ee/lib/ee/gitlab/auth/ldap/person.rb' - 'ee/lib/ee/gitlab/background_migration/delete_invalid_epic_issues.rb' - - 'ee/lib/gitlab/search/index_curator.rb' - 'ee/spec/controllers/autocomplete_controller_spec.rb' - 'ee/spec/controllers/countries_controller_spec.rb' - 'ee/spec/controllers/groups/audit_events_controller_spec.rb' @@ -85,7 +84,6 @@ Rails/Pluck: - 'ee/spec/services/ee/releases/create_evidence_service_spec.rb' - 'ee/spec/services/iterations/cadences/create_iterations_in_advance_service_spec.rb' - 'ee/spec/services/quick_actions/interpret_service_spec.rb' - - 'ee/spec/support/elastic.rb' - 'ee/spec/support/helpers/feature_approval_helper.rb' - 'ee/spec/support/shared_examples/controllers/analytics/cycle_analytics/shared_stage_shared_examples.rb' - 'ee/spec/support/shared_examples/requests/api/graphql/incident_management/escalation_policies_shared_examples.rb' diff --git a/.rubocop_todo/rails/time_zone.yml b/.rubocop_todo/rails/time_zone.yml index 67295680df5..a827a78a4de 100644 --- a/.rubocop_todo/rails/time_zone.yml +++ b/.rubocop_todo/rails/time_zone.yml @@ -2,7 +2,6 @@ # Cop supports --autocorrect. Rails/TimeZone: Exclude: - - 'ee/lib/gitlab/elastic/indexer.rb' - 'ee/lib/gitlab/geo/event_gap_tracking.rb' - 'ee/lib/gitlab/geo/log_cursor/logger.rb' - 'ee/lib/gitlab/geo/oauth/login_state.rb' diff --git a/.rubocop_todo/rspec/contain_exactly.yml b/.rubocop_todo/rspec/contain_exactly.yml index 5a0b01242ce..9b708365926 100644 --- a/.rubocop_todo/rspec/contain_exactly.yml +++ b/.rubocop_todo/rspec/contain_exactly.yml @@ -76,7 +76,6 @@ RSpec/ContainExactly: - 'ee/spec/support/shared_examples/models/vulnerability_and_finding_shared_examples.rb' - 'ee/spec/support/shared_examples/requests/api/project_approval_rules_api_shared_examples.rb' - 'ee/spec/workers/elastic_namespace_rollout_worker_spec.rb' - - 'ee/spec/workers/search/index_curation_worker_spec.rb' - 'spec/controllers/concerns/continue_params_spec.rb' - 'spec/controllers/concerns/strong_pagination_params_spec.rb' - 'spec/controllers/dashboard/groups_controller_spec.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 91cdb7c537c..e4e9b295e7f 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -333,10 +333,8 @@ RSpec/ContextWording: - 'ee/spec/lib/gitlab/code_owners/loader_spec.rb' - 'ee/spec/lib/gitlab/code_owners/users_loader_spec.rb' - 'ee/spec/lib/gitlab/custom_file_templates_spec.rb' - - 'ee/spec/lib/gitlab/elastic/bulk_indexer_spec.rb' - 'ee/spec/lib/gitlab/elastic/client_spec.rb' - 'ee/spec/lib/gitlab/elastic/group_search_results_spec.rb' - - 'ee/spec/lib/gitlab/elastic/indexer_spec.rb' - 'ee/spec/lib/gitlab/elastic/snippet_search_results_spec.rb' - 'ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb' - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 78d8e777da4..c9e318863fd 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -361,7 +361,6 @@ RSpec/NamedSubject: - 'ee/spec/lib/gitlab/code_owners/validator_spec.rb' - 'ee/spec/lib/gitlab/code_owners_spec.rb' - 'ee/spec/lib/gitlab/elastic/group_search_results_spec.rb' - - 'ee/spec/lib/gitlab/elastic/indexer_spec.rb' - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb' - 'ee/spec/lib/gitlab/geo/geo_node_status_check_spec.rb' - 'ee/spec/lib/gitlab/geo/geo_tasks_spec.rb' @@ -1112,7 +1111,6 @@ RSpec/NamedSubject: - 'ee/spec/workers/repository_update_mirror_worker_spec.rb' - 'ee/spec/workers/requirements_management/import_requirements_csv_worker_spec.rb' - 'ee/spec/workers/requirements_management/process_requirements_reports_worker_spec.rb' - - 'ee/spec/workers/search/index_curation_worker_spec.rb' - 'ee/spec/workers/search/zoekt/namespace_indexer_worker_spec.rb' - 'ee/spec/workers/security/scan_execution_policies/rule_schedule_worker_spec.rb' - 'ee/spec/workers/security/scans/purge_by_job_id_worker_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index 471649506bd..a3d21c45725 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -63,7 +63,6 @@ RSpec/ReceiveMessages: - 'ee/spec/lib/gitlab/duo/chat/request_spec.rb' - 'ee/spec/lib/gitlab/duo/chat/step_executor_spec.rb' - 'ee/spec/lib/gitlab/duo/developments/setup_groups_for_model_evaluation_spec.rb' - - 'ee/spec/lib/gitlab/elastic/bulk_indexer_spec.rb' - 'ee/spec/lib/gitlab/experiment_feature_rollout_spec.rb' - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb' - 'ee/spec/lib/gitlab/geo/geo_tasks_spec.rb' @@ -74,7 +73,6 @@ RSpec/ReceiveMessages: - 'ee/spec/lib/gitlab/llm/chain/tools/epic_reader/executor_spec.rb' - 'ee/spec/lib/gitlab/llm/vertex_ai/client_spec.rb' - 'ee/spec/lib/gitlab/mirror_spec.rb' - - 'ee/spec/lib/gitlab/search/index_curator_spec.rb' - 'ee/spec/lib/gitlab/vulnerability_scanning/finding_builder_spec.rb' - 'ee/spec/lib/google_cloud/artifact_registry/client_spec.rb' - 'ee/spec/lib/omni_auth/strategies/group_saml_spec.rb' diff --git a/.rubocop_todo/search/namespaced_class.yml b/.rubocop_todo/search/namespaced_class.yml index fdebee1797c..359b00cedc2 100644 --- a/.rubocop_todo/search/namespaced_class.yml +++ b/.rubocop_todo/search/namespaced_class.yml @@ -141,7 +141,6 @@ Search/NamespacedClass: - 'ee/lib/gitlab/search/aggregation.rb' - 'ee/lib/gitlab/search/aggregation_parser.rb' - 'ee/lib/gitlab/search/client.rb' - - 'ee/lib/gitlab/search/index_curator.rb' - 'ee/lib/gitlab/search/recent_epics.rb' - 'ee/lib/system_check/app/advanced_search_migrations_check.rb' - 'ee/lib/system_check/app/search_check.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index bfbc7bc92b6..2cab1ac11c2 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -376,7 +376,6 @@ Style/IfUnlessModifier: - 'ee/lib/gitlab/authority_analyzer.rb' - 'ee/lib/gitlab/code_owners/file.rb' - 'ee/lib/gitlab/custom_file_templates.rb' - - 'ee/lib/gitlab/elastic/indexer.rb' - 'ee/lib/gitlab/geo/git_ssh_proxy.rb' - 'ee/lib/gitlab/geo/health_check.rb' - 'ee/lib/gitlab/geo/log_cursor/daemon.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index 264ddc53c90..466c9ba48b2 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -1393,7 +1393,6 @@ Style/InlineDisableAnnotation: - 'ee/app/workers/projects/disable_legacy_open_source_license_for_inactive_projects_worker.rb' - 'ee/app/workers/pull_mirrors/reenable_configuration_worker.rb' - 'ee/app/workers/refresh_license_compliance_checks_worker.rb' - - 'ee/app/workers/search/index_curation_worker.rb' - 'ee/app/workers/security/create_orchestration_policy_worker.rb' - 'ee/app/workers/security/orchestration_policy_rule_schedule_worker.rb' - 'ee/app/workers/security/scan_execution_policies/rule_schedule_worker.rb' @@ -1520,7 +1519,6 @@ Style/InlineDisableAnnotation: - 'ee/lib/gitlab/elastic/elasticsearch_enabled_cache.rb' - 'ee/lib/gitlab/elastic/group_search_results.rb' - 'ee/lib/gitlab/elastic/helper.rb' - - 'ee/lib/gitlab/elastic/indexer.rb' - 'ee/lib/gitlab/elastic/search_results.rb' - 'ee/lib/gitlab/geo/event_gap_tracking.rb' - 'ee/lib/gitlab/geo/geo_node_status_check.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 78d94b7d829..50d6dddeec6 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -36ef4e1bd95e15e6a369bf0bed384ddc7f06caa5 +70dee0e4de7f471ba5ce1bde2146df4252c1a927 diff --git a/app/assets/javascripts/ci/pipelines_page/components/pipeline_url.vue b/app/assets/javascripts/ci/pipelines_page/components/pipeline_url.vue index ac9fbf471af..0999a389bf8 100644 --- a/app/assets/javascripts/ci/pipelines_page/components/pipeline_url.vue +++ b/app/assets/javascripts/ci/pipelines_page/components/pipeline_url.vue @@ -195,7 +195,7 @@ export default { >#{{ pipeline[pipelineIdType] }} -
+
-
+
{{ commitShortSha }} - + {{ durationFormatted }}

@@ -50,7 +50,13 @@ export default { class="gl-m-0 gl-inline-flex gl-items-center gl-whitespace-nowrap gl-text-subtle" data-testid="finished-at" > - +