diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 18:10:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 18:10:18 +0000 |
| commit | 3413ab248287b19b1d2cd1f78d957096546e8c37 (patch) | |
| tree | b59d4bddbee10eceebbe7a085c3d660307d03ca5 | |
| parent | dbe0e5676267eb142dd8d81e4c881c997cb96962 (diff) | |
| download | gitlab-ce-3413ab248287b19b1d2cd1f78d957096546e8c37.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
131 files changed, 747 insertions, 423 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 0332f5689bc..766491a4774 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -968,6 +968,7 @@ .frontend:rules:default-frontend-jobs: rules: - <<: *if-merge-request-labels-run-all-rspec + - <<: *if-merge-request-labels-frontend-and-feature-flag - <<: *if-default-refs changes: *code-backstage-patterns @@ -2278,6 +2279,7 @@ - <<: *if-default-refs changes: *workhorse-patterns - <<: *if-merge-request-labels-run-all-rspec + - <<: *if-merge-request-labels-frontend-and-feature-flag .test-metadata:rules:update-tests-metadata: rules: diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml index fea8dd31223..e45726f8a51 100644 --- a/.rubocop_todo/rspec/missing_feature_category.yml +++ b/.rubocop_todo/rspec/missing_feature_category.yml @@ -205,7 +205,6 @@ RSpec/MissingFeatureCategory: - 'ee/spec/graphql/graphql_triggers_spec.rb' - 'ee/spec/graphql/mutations/app_sec/fuzzing/api/ci_configuration/create_spec.rb' - 'ee/spec/graphql/mutations/app_sec/fuzzing/coverage/corpus/create_spec.rb' - - 'ee/spec/graphql/mutations/audit_events/streaming/event_type_filters/create_spec.rb' - 'ee/spec/graphql/mutations/audit_events/streaming/event_type_filters/destroy_spec.rb' - 'ee/spec/graphql/mutations/audit_events/streaming/headers/create_spec.rb' - 'ee/spec/graphql/mutations/audit_events/streaming/headers/destroy_spec.rb' @@ -1227,7 +1226,6 @@ RSpec/MissingFeatureCategory: - 'ee/spec/models/concerns/ee/project_security_scanners_information_spec.rb' - 'ee/spec/models/concerns/ee/weight_eventable_spec.rb' - 'ee/spec/models/concerns/elastic/application_versioned_search_spec.rb' - - 'ee/spec/models/concerns/elastic/issue_spec.rb' - 'ee/spec/models/concerns/elastic/merge_request_spec.rb' - 'ee/spec/models/concerns/elastic/milestone_spec.rb' - 'ee/spec/models/concerns/elastic/project_wiki_spec.rb' @@ -1334,22 +1332,11 @@ RSpec/MissingFeatureCategory: - 'ee/spec/models/epic/related_epic_link_spec.rb' - 'ee/spec/models/epic_user_mention_spec.rb' - 'ee/spec/models/geo/cache_invalidation_event_spec.rb' - - 'ee/spec/models/geo/ci_secure_file_registry_spec.rb' - - 'ee/spec/models/geo/container_repository_registry_spec.rb' - 'ee/spec/models/geo/deleted_project_spec.rb' - - 'ee/spec/models/geo/dependency_proxy_blob_registry_spec.rb' - - 'ee/spec/models/geo/dependency_proxy_manifest_registry_spec.rb' - 'ee/spec/models/geo/event_log_spec.rb' - 'ee/spec/models/geo/event_log_state_spec.rb' - 'ee/spec/models/geo/every_geo_event_spec.rb' - - 'ee/spec/models/geo/group_wiki_repository_registry_spec.rb' - 'ee/spec/models/geo/hashed_storage_migrated_event_spec.rb' - - 'ee/spec/models/geo/job_artifact_registry_spec.rb' - - 'ee/spec/models/geo/lfs_object_registry_spec.rb' - - 'ee/spec/models/geo/merge_request_diff_registry_spec.rb' - - 'ee/spec/models/geo/pages_deployment_registry_spec.rb' - - 'ee/spec/models/geo/pipeline_artifact_registry_spec.rb' - - 'ee/spec/models/geo/project_wiki_repository_registry_spec.rb' - 'ee/spec/models/geo/project_wiki_repository_state_spec.rb' - 'ee/spec/models/geo/push_user_spec.rb' - 'ee/spec/models/geo/repositories_changed_event_spec.rb' @@ -1358,10 +1345,7 @@ RSpec/MissingFeatureCategory: - 'ee/spec/models/geo/repository_updated_event_spec.rb' - 'ee/spec/models/geo/reset_checksum_event_spec.rb' - 'ee/spec/models/geo/secondary_usage_data_spec.rb' - - 'ee/spec/models/geo/snippet_repository_registry_spec.rb' - - 'ee/spec/models/geo/terraform_state_version_registry_spec.rb' - 'ee/spec/models/geo/tracking_base_spec.rb' - - 'ee/spec/models/geo/upload_registry_spec.rb' - 'ee/spec/models/geo/upload_state_spec.rb' - 'ee/spec/models/geo_node_namespace_link_spec.rb' - 'ee/spec/models/geo_node_spec.rb' @@ -1708,7 +1692,6 @@ RSpec/MissingFeatureCategory: - 'ee/spec/services/audit_events/release_updated_audit_event_service_spec.rb' - 'ee/spec/services/audit_events/runner_custom_audit_event_service_spec.rb' - 'ee/spec/services/audit_events/runners_token_audit_event_service_spec.rb' - - 'ee/spec/services/audit_events/streaming/event_type_filters/create_service_spec.rb' - 'ee/spec/services/audit_events/streaming/event_type_filters/destroy_service_spec.rb' - 'ee/spec/services/audit_events/streaming/headers/base_spec.rb' - 'ee/spec/services/audit_events/streaming/headers/create_service_spec.rb' @@ -1740,21 +1723,8 @@ RSpec/MissingFeatureCategory: - 'ee/spec/services/boards/update_service_spec.rb' - 'ee/spec/services/boards/user_preferences/update_service_spec.rb' - 'ee/spec/services/branches/delete_service_spec.rb' - - 'ee/spec/services/dashboard/environments/list_service_spec.rb' - - 'ee/spec/services/dashboard/operations/list_service_spec.rb' - - 'ee/spec/services/dashboard/projects/create_service_spec.rb' - - 'ee/spec/services/dashboard/projects/list_service_spec.rb' - - 'ee/spec/services/deploy_keys/create_service_spec.rb' - - 'ee/spec/services/deployments/auto_rollback_service_spec.rb' - 'ee/spec/services/ee/auto_merge_service_spec.rb' - - 'ee/spec/services/ee/deployments/update_environment_service_spec.rb' - - 'ee/spec/services/ee/design_management/delete_designs_service_spec.rb' - - 'ee/spec/services/ee/design_management/save_designs_service_spec.rb' - 'ee/spec/services/ee/event_create_service_spec.rb' - - 'ee/spec/services/ee/git/branch_push_service_spec.rb' - - 'ee/spec/services/ee/git/wiki_push_service_spec.rb' - - 'ee/spec/services/ee/gpg_keys/create_service_spec.rb' - - 'ee/spec/services/ee/gpg_keys/destroy_service_spec.rb' - 'ee/spec/services/ee/groups/autocomplete_service_spec.rb' - 'ee/spec/services/ee/groups/deploy_tokens/create_service_spec.rb' - 'ee/spec/services/ee/groups/deploy_tokens/destroy_service_spec.rb' @@ -1825,91 +1795,7 @@ RSpec/MissingFeatureCategory: - 'ee/spec/services/ee/users/reject_service_spec.rb' - 'ee/spec/services/ee/users/update_service_spec.rb' - 'ee/spec/services/ee/vulnerability_feedback_module/update_service_spec.rb' - - 'ee/spec/services/elastic/cluster_reindexing_service_spec.rb' - - 'ee/spec/services/elastic/data_migration_service_spec.rb' - - 'ee/spec/services/elastic/index_projects_by_id_service_spec.rb' - - 'ee/spec/services/elastic/index_projects_by_range_service_spec.rb' - - 'ee/spec/services/elastic/index_projects_service_spec.rb' - - 'ee/spec/services/elastic/indexing_control_service_spec.rb' - - 'ee/spec/services/elastic/metrics_update_service_spec.rb' - - 'ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb' - - 'ee/spec/services/emails/create_service_spec.rb' - - 'ee/spec/services/emails/destroy_service_spec.rb' - - 'ee/spec/services/epic_issues/destroy_service_spec.rb' - - 'ee/spec/services/epic_issues/list_service_spec.rb' - - 'ee/spec/services/epic_issues/update_service_spec.rb' - - 'ee/spec/services/epics/close_service_spec.rb' - - 'ee/spec/services/epics/create_service_spec.rb' - - 'ee/spec/services/epics/descendant_count_service_spec.rb' - - 'ee/spec/services/epics/epic_links/list_service_spec.rb' - - 'ee/spec/services/epics/issue_promote_service_spec.rb' - - 'ee/spec/services/epics/reopen_service_spec.rb' - - 'ee/spec/services/epics/transfer_service_spec.rb' - - 'ee/spec/services/epics/update_dates_service_spec.rb' - - 'ee/spec/services/epics/update_service_spec.rb' - 'ee/spec/services/external_status_checks/create_service_spec.rb' - - 'ee/spec/services/external_status_checks/destroy_service_spec.rb' - - 'ee/spec/services/external_status_checks/dispatch_service_spec.rb' - - 'ee/spec/services/external_status_checks/update_service_spec.rb' - - 'ee/spec/services/feature_flag_issues/destroy_service_spec.rb' - - 'ee/spec/services/geo/base_file_service_spec.rb' - - 'ee/spec/services/geo/blob_download_service_spec.rb' - - 'ee/spec/services/geo/blob_upload_service_spec.rb' - - 'ee/spec/services/geo/cache_invalidation_event_store_spec.rb' - - 'ee/spec/services/geo/container_repository_registry_removal_service_spec.rb' - - 'ee/spec/services/geo/container_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/container_repository_sync_spec.rb' - - 'ee/spec/services/geo/event_service_spec.rb' - - 'ee/spec/services/geo/file_registry_removal_service_spec.rb' - - 'ee/spec/services/geo/files_expire_service_spec.rb' - - 'ee/spec/services/geo/framework_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/graphql_request_service_spec.rb' - - 'ee/spec/services/geo/hashed_storage_attachments_event_store_spec.rb' - - 'ee/spec/services/geo/hashed_storage_attachments_migration_service_spec.rb' - - 'ee/spec/services/geo/hashed_storage_migrated_event_store_spec.rb' - - 'ee/spec/services/geo/hashed_storage_migration_service_spec.rb' - - 'ee/spec/services/geo/metrics_update_service_spec.rb' - - 'ee/spec/services/geo/move_repository_service_spec.rb' - - 'ee/spec/services/geo/node_create_service_spec.rb' - - 'ee/spec/services/geo/node_status_request_service_spec.rb' - - 'ee/spec/services/geo/node_update_service_spec.rb' - - 'ee/spec/services/geo/project_housekeeping_service_spec.rb' - - 'ee/spec/services/geo/prune_event_log_service_spec.rb' - - 'ee/spec/services/geo/rename_repository_service_spec.rb' - - 'ee/spec/services/geo/replication_toggle_request_service_spec.rb' - - 'ee/spec/services/geo/repositories_changed_event_store_spec.rb' - - 'ee/spec/services/geo/repository_base_sync_service_spec.rb' - - 'ee/spec/services/geo/repository_created_event_store_spec.rb' - - 'ee/spec/services/geo/repository_deleted_event_store_spec.rb' - - 'ee/spec/services/geo/repository_destroy_service_spec.rb' - - 'ee/spec/services/geo/repository_registry_removal_service_spec.rb' - - 'ee/spec/services/geo/repository_renamed_event_store_spec.rb' - - 'ee/spec/services/geo/repository_updated_event_store_spec.rb' - - 'ee/spec/services/geo/repository_updated_service_spec.rb' - - 'ee/spec/services/geo/repository_verification_reset_spec.rb' - - 'ee/spec/services/geo/reset_checksum_event_store_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/activate_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/check_future_renewal_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/create_hand_raise_lead_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/create_lead_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/create_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/create_trial_or_lead_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/extend_reactivate_trial_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/fetch_purchase_eligible_namespaces_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/fetch_subscription_plans_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/plan_upgrade_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/preview_billable_user_change_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/reconciliations/check_seat_usage_alerts_eligibility_service_spec.rb' - - 'ee/spec/services/gitlab_subscriptions/trials/apply_trial_service_spec.rb' - - 'ee/spec/services/group_saml/group_managed_accounts/clean_up_members_service_spec.rb' - - 'ee/spec/services/group_saml/group_managed_accounts/transfer_membership_service_spec.rb' - - 'ee/spec/services/group_saml/identity/destroy_service_spec.rb' - - 'ee/spec/services/group_saml/saml_group_links/create_service_spec.rb' - - 'ee/spec/services/group_saml/saml_group_links/destroy_service_spec.rb' - - 'ee/spec/services/group_saml/saml_provider/create_service_spec.rb' - - 'ee/spec/services/group_saml/saml_provider/update_service_spec.rb' - - 'ee/spec/services/group_saml/sign_up_service_spec.rb' - 'ee/spec/services/groups/create_service_spec.rb' - 'ee/spec/services/groups/epics_count_service_spec.rb' - 'ee/spec/services/groups/mark_for_deletion_service_spec.rb' @@ -1918,7 +1804,6 @@ RSpec/MissingFeatureCategory: - 'ee/spec/services/groups/restore_service_spec.rb' - 'ee/spec/services/groups/schedule_bulk_repository_shard_moves_service_spec.rb' - 'ee/spec/services/groups/seat_usage_export_service_spec.rb' - - 'ee/spec/services/groups/transfer_service_spec.rb' - 'ee/spec/services/groups/update_repository_storage_service_spec.rb' - 'ee/spec/services/groups/update_service_spec.rb' - 'ee/spec/services/historical_user_data/csv_service_spec.rb' @@ -2519,7 +2404,6 @@ RSpec/MissingFeatureCategory: - 'spec/controllers/oauth/applications_controller_spec.rb' - 'spec/controllers/oauth/authorizations_controller_spec.rb' - 'spec/controllers/oauth/authorized_applications_controller_spec.rb' - - 'spec/controllers/oauth/jira_dvcs/authorizations_controller_spec.rb' - 'spec/controllers/oauth/token_info_controller_spec.rb' - 'spec/controllers/oauth/tokens_controller_spec.rb' - 'spec/controllers/omniauth_callbacks_controller_spec.rb' @@ -2909,9 +2793,6 @@ RSpec/MissingFeatureCategory: - 'spec/graphql/mutations/namespace/package_settings/update_spec.rb' - 'spec/graphql/mutations/notes/reposition_image_diff_note_spec.rb' - 'spec/graphql/mutations/pages/mark_onboarding_complete_spec.rb' - - 'spec/graphql/mutations/release_asset_links/create_spec.rb' - - 'spec/graphql/mutations/release_asset_links/delete_spec.rb' - - 'spec/graphql/mutations/release_asset_links/update_spec.rb' - 'spec/graphql/mutations/releases/create_spec.rb' - 'spec/graphql/mutations/releases/delete_spec.rb' - 'spec/graphql/mutations/releases/update_spec.rb' @@ -5141,7 +5022,6 @@ RSpec/MissingFeatureCategory: - 'spec/lib/gitlab/quick_actions/substitution_definition_spec.rb' - 'spec/lib/gitlab/quick_actions/timeline_text_and_date_time_separator_spec.rb' - 'spec/lib/gitlab/quick_actions/users_extractor_spec.rb' - - 'spec/lib/gitlab/rack_attack/instrumented_cache_store_spec.rb' - 'spec/lib/gitlab/rack_attack/request_spec.rb' - 'spec/lib/gitlab/rack_attack/user_allowlist_spec.rb' - 'spec/lib/gitlab/rack_attack_spec.rb' @@ -5340,7 +5220,6 @@ RSpec/MissingFeatureCategory: - 'spec/lib/gitlab/usage/metrics/instrumentations/cert_based_clusters_ff_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/collected_data_categories_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/count_boards_metric_spec.rb' - - 'spec/lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/count_imported_projects_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/count_imported_projects_total_metric_spec.rb' - 'spec/lib/gitlab/usage/metrics/instrumentations/count_issues_metric_spec.rb' @@ -5885,7 +5764,6 @@ RSpec/MissingFeatureCategory: - 'spec/models/instance_configuration_spec.rb' - 'spec/models/instance_metadata/kas_spec.rb' - 'spec/models/instance_metadata_spec.rb' - - 'spec/models/integration_spec.rb' - 'spec/models/integrations/asana_spec.rb' - 'spec/models/integrations/assembla_spec.rb' - 'spec/models/integrations/bamboo_spec.rb' @@ -5905,7 +5783,6 @@ RSpec/MissingFeatureCategory: - 'spec/models/integrations/chat_message/wiki_page_message_spec.rb' - 'spec/models/integrations/confluence_spec.rb' - 'spec/models/integrations/custom_issue_tracker_spec.rb' - - 'spec/models/integrations/datadog_spec.rb' - 'spec/models/integrations/discord_spec.rb' - 'spec/models/integrations/drone_ci_spec.rb' - 'spec/models/integrations/emails_on_push_spec.rb' @@ -6685,84 +6562,8 @@ RSpec/MissingFeatureCategory: - 'spec/services/bulk_update_integration_service_spec.rb' - 'spec/services/cohorts_service_spec.rb' - 'spec/services/compare_service_spec.rb' - - 'spec/services/container_expiration_policies/cleanup_service_spec.rb' - - 'spec/services/container_expiration_policies/update_service_spec.rb' - - 'spec/services/customer_relations/contacts/create_service_spec.rb' - - 'spec/services/customer_relations/contacts/update_service_spec.rb' - - 'spec/services/customer_relations/organizations/create_service_spec.rb' - - 'spec/services/customer_relations/organizations/update_service_spec.rb' - - 'spec/services/database/consistency_fix_service_spec.rb' - - 'spec/services/dependency_proxy/auth_token_service_spec.rb' - - 'spec/services/dependency_proxy/find_cached_manifest_service_spec.rb' - - 'spec/services/dependency_proxy/group_settings/update_service_spec.rb' - - 'spec/services/dependency_proxy/head_manifest_service_spec.rb' - - 'spec/services/dependency_proxy/image_ttl_group_policies/update_service_spec.rb' - - 'spec/services/dependency_proxy/request_token_service_spec.rb' - - 'spec/services/deploy_keys/create_service_spec.rb' - - 'spec/services/deployments/archive_in_project_service_spec.rb' - - 'spec/services/deployments/create_for_build_service_spec.rb' - - 'spec/services/deployments/create_service_spec.rb' - - 'spec/services/deployments/link_merge_requests_service_spec.rb' - - 'spec/services/deployments/older_deployments_drop_service_spec.rb' - - 'spec/services/deployments/update_environment_service_spec.rb' - - 'spec/services/deployments/update_service_spec.rb' - - 'spec/services/design_management/copy_design_collection/copy_service_spec.rb' - - 'spec/services/design_management/copy_design_collection/queue_service_spec.rb' - - 'spec/services/design_management/delete_designs_service_spec.rb' - - 'spec/services/design_management/design_user_notes_count_service_spec.rb' - - 'spec/services/design_management/generate_image_versions_service_spec.rb' - - 'spec/services/design_management/move_designs_service_spec.rb' - - 'spec/services/discussions/capture_diff_note_position_service_spec.rb' - - 'spec/services/discussions/capture_diff_note_positions_service_spec.rb' - - 'spec/services/discussions/update_diff_position_service_spec.rb' - - 'spec/services/draft_notes/create_service_spec.rb' - - 'spec/services/draft_notes/destroy_service_spec.rb' - - 'spec/services/draft_notes/publish_service_spec.rb' - - 'spec/services/emails/confirm_service_spec.rb' - - 'spec/services/emails/create_service_spec.rb' - - 'spec/services/emails/destroy_service_spec.rb' - - 'spec/services/environments/auto_stop_service_spec.rb' - - 'spec/services/environments/canary_ingress/update_service_spec.rb' - - 'spec/services/environments/create_for_build_service_spec.rb' - - 'spec/services/environments/reset_auto_stop_service_spec.rb' - - 'spec/services/environments/schedule_to_delete_review_apps_service_spec.rb' - - 'spec/services/environments/stop_service_spec.rb' - - 'spec/services/error_tracking/base_service_spec.rb' - - 'spec/services/error_tracking/collect_error_service_spec.rb' - - 'spec/services/error_tracking/issue_details_service_spec.rb' - - 'spec/services/error_tracking/issue_latest_event_service_spec.rb' - - 'spec/services/error_tracking/issue_update_service_spec.rb' - - 'spec/services/error_tracking/list_issues_service_spec.rb' - 'spec/services/event_create_service_spec.rb' - - 'spec/services/events/destroy_service_spec.rb' - - 'spec/services/events/render_service_spec.rb' - - 'spec/services/feature_flags/create_service_spec.rb' - - 'spec/services/feature_flags/destroy_service_spec.rb' - - 'spec/services/feature_flags/hook_service_spec.rb' - - 'spec/services/feature_flags/update_service_spec.rb' - - 'spec/services/files/create_service_spec.rb' - - 'spec/services/files/delete_service_spec.rb' - - 'spec/services/files/multi_service_spec.rb' - - 'spec/services/files/update_service_spec.rb' - - 'spec/services/git/base_hooks_service_spec.rb' - - 'spec/services/git/branch_hooks_service_spec.rb' - - 'spec/services/git/branch_push_service_spec.rb' - - 'spec/services/git/process_ref_changes_service_spec.rb' - - 'spec/services/git/tag_hooks_service_spec.rb' - - 'spec/services/git/tag_push_service_spec.rb' - - 'spec/services/git/wiki_push_service/change_spec.rb' - - 'spec/services/google_cloud/create_cloudsql_instance_service_spec.rb' - - 'spec/services/google_cloud/create_service_accounts_service_spec.rb' - - 'spec/services/google_cloud/enable_cloud_run_service_spec.rb' - - 'spec/services/google_cloud/enable_cloudsql_service_spec.rb' - - 'spec/services/google_cloud/gcp_region_add_or_replace_service_spec.rb' - - 'spec/services/google_cloud/generate_pipeline_service_spec.rb' - - 'spec/services/google_cloud/get_cloudsql_instances_service_spec.rb' - - 'spec/services/google_cloud/service_accounts_service_spec.rb' - - 'spec/services/google_cloud/setup_cloudsql_instance_service_spec.rb' - - 'spec/services/gpg_keys/create_service_spec.rb' - 'spec/services/gpg_keys/destroy_service_spec.rb' - - 'spec/services/grafana/proxy_service_spec.rb' - 'spec/services/gravatar_service_spec.rb' - 'spec/services/groups/auto_devops_service_spec.rb' - 'spec/services/groups/autocomplete_service_spec.rb' diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml index 101a0b6429f..cb9ae6e9bd9 100644 --- a/.rubocop_todo/style/format_string.yml +++ b/.rubocop_todo/style/format_string.yml @@ -158,7 +158,6 @@ Style/FormatString: - 'danger/roulette/Dangerfile' - 'ee/app/components/billing/plan_component.rb' - 'ee/app/components/namespaces/free_user_cap/enforcement_alert_component.rb' - - 'ee/app/components/namespaces/free_user_cap/notification_alert_component.rb' - 'ee/app/components/namespaces/free_user_cap/usage_quota_alert_component.rb' - 'ee/app/components/namespaces/free_user_cap/usage_quota_trial_alert_component.rb' - 'ee/app/controllers/admin/elasticsearch_controller.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index dc2b72e9fd8..c9439b8889d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -a965842fe3cc7212b35f936d59ede06c20868d23 +27c00fa0b260e976c5d6c0382ea850949cb51d63 @@ -565,7 +565,7 @@ gem 'oj-introspect', '~> 0.7' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' -gem 'webauthn', '~> 2.3' +gem 'webauthn', '~> 3.0' # IPAddress utilities gem 'ipaddress', '~> 0.8.3' diff --git a/Gemfile.checksum b/Gemfile.checksum index bc3e941251c..b4f600be0ac 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -33,7 +33,7 @@ {"name":"attr_required","version":"1.0.1","platform":"ruby","checksum":"024e10393bd30901e1adf6769bd756b873a5ef7da60f86f8f11066116b5742bc"}, {"name":"autoprefixer-rails","version":"10.2.5.1","platform":"ruby","checksum":"3711d67f1112361c7628847ac192d8aa6f3b8abe47527aee8a69dc8985e798ee"}, {"name":"awesome_print","version":"1.9.2","platform":"ruby","checksum":"e99b32b704acff16d768b3468680793ced40bfdc4537eb07e06a4be11133786e"}, -{"name":"awrence","version":"1.1.1","platform":"ruby","checksum":"9be584c97408ed92d5e1ca11740853646fe270de675f2f8dd44e8233226dfc97"}, +{"name":"awrence","version":"1.2.1","platform":"ruby","checksum":"dd1d214c12a91f449d1ef81d7ee3babc2816944e450752e7522c65521872483e"}, {"name":"aws-eventstream","version":"1.2.0","platform":"ruby","checksum":"ffa53482c92880b001ff2fb06919b9bb82fd847cbb0fa244985d2ebb6dd0d1df"}, {"name":"aws-partitions","version":"1.703.0","platform":"ruby","checksum":"3d32fcdcb2799fe0472a9b30990035713d7a75ac8b77bd7767ef5ee2914ea748"}, {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"}, @@ -89,7 +89,7 @@ {"name":"concurrent-ruby","version":"1.2.0","platform":"ruby","checksum":"a5e799f71e7490f24a534d58c91380267d0ae306af0cdc518d6848b93475dae2"}, {"name":"connection_pool","version":"2.3.0","platform":"ruby","checksum":"677985be912f33c90f98f229aaa0c0ddb2ef8776f21929a36eeeb25251c944da"}, {"name":"cork","version":"0.3.0","platform":"ruby","checksum":"a0a0ac50e262f8514d1abe0a14e95e71c98b24e3378690e5d044daf0013ad4bc"}, -{"name":"cose","version":"1.0.0","platform":"ruby","checksum":"520ebaad97b56d2873de02ff4e2c973f5e77ce2f8edbda454af9ee3073643bc0"}, +{"name":"cose","version":"1.3.0","platform":"ruby","checksum":"63247c66a5bc76e53926756574fe3724cc0a88707e358c90532ae2a320e98601"}, {"name":"countries","version":"4.0.1","platform":"ruby","checksum":"d32e8a3c0b22949f1a41ea6d9005f5168ffce226f8fe077d1d6be785fffa81c5"}, {"name":"crack","version":"0.4.3","platform":"ruby","checksum":"5318ba8cd9cf7e0b5feb38948048503ba4b1fdc1b6ff30a39f0a00feb6036b29"}, {"name":"crass","version":"1.0.6","platform":"ruby","checksum":"dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d"}, @@ -412,7 +412,7 @@ {"name":"open4","version":"1.3.4","platform":"ruby","checksum":"a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1"}, {"name":"openid_connect","version":"1.3.0","platform":"ruby","checksum":"a796855096850cc01140e37ea6ae9fd14f2be818b9b5bc698418063dfe228770"}, {"name":"openssl","version":"2.2.2","platform":"ruby","checksum":"53f72382bac046c36c37049c7ec9d5597d42628d140b5cfbcd61e0226c0ca077"}, -{"name":"openssl-signature_algorithm","version":"0.4.0","platform":"ruby","checksum":"e53a225b773784935249cf4c61238c6cf0e1e464e78ae2f8ddaf995fb22ca991"}, +{"name":"openssl-signature_algorithm","version":"1.3.0","platform":"ruby","checksum":"a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80"}, {"name":"opentracing","version":"0.5.0","platform":"ruby","checksum":"deb5d7abe6b0e7631d866d8cb5ee7bb9352650a504a32f61591302bc510b9286"}, {"name":"optimist","version":"3.0.1","platform":"ruby","checksum":"336b753676d6117cad9301fac7e91dab4228f747d4e7179891ad3a163c64e2ed"}, {"name":"org-ruby","version":"0.9.12","platform":"ruby","checksum":"93cbec3a4470cb9dca6a4a98dc276a6434ea9d9e7bc2d42ea33c3aedd5d1c974"}, @@ -540,7 +540,6 @@ {"name":"sassc-rails","version":"2.1.0","platform":"ruby","checksum":"764dcc74e06930e3483caf0d595084d11f2b0fefd6539abf487cdddfba6cafa2"}, {"name":"sawyer","version":"0.9.2","platform":"ruby","checksum":"fa3a72d62a4525517b18857ddb78926aab3424de0129be6772a8e2ba240e7aca"}, {"name":"sd_notify","version":"0.1.1","platform":"ruby","checksum":"cbc7ac6caa7cedd26b30a72b5eeb6f36050dc0752df263452ea24fb5a4ad3131"}, -{"name":"securecompare","version":"1.0.0","platform":"ruby","checksum":"cb0c6599deaaedf6d28f8d88538b06e7198c4826b1b8edb1dbeb44a2162fc62b"}, {"name":"seed-fu","version":"2.3.7","platform":"ruby","checksum":"f19673443e9af799b730e3d4eca6a89b39e5a36825015dffd00d02ea3365cf74"}, {"name":"selenium-webdriver","version":"3.142.7","platform":"ruby","checksum":"dea0993e0e4fdb364f0453144814c0e6099a411d17396807c6cac666d0ddac29"}, {"name":"sentry-rails","version":"5.1.1","platform":"ruby","checksum":"906ef0a776ddc35884ab8b548856ba81c607e3fdee7c9c9f7c44efccc16a657f"}, @@ -617,7 +616,7 @@ {"name":"tins","version":"1.31.1","platform":"ruby","checksum":"51c4a347c25c630d310cbc2c040ffb84e266c8227f2ade881f1130ee4f9fbecf"}, {"name":"toml-rb","version":"2.2.0","platform":"ruby","checksum":"a1e2c54ac3cc9d49861004f75f0648b3622ac03a76abe105358c31553227d9a6"}, {"name":"tomlrb","version":"1.3.0","platform":"ruby","checksum":"68666bf53fa70ba686a48a7435ce7e086f5227c58c4c993bd9792f4760f2a503"}, -{"name":"tpm-key_attestation","version":"0.9.0","platform":"ruby","checksum":"e469ad9111a68dab4d04596e1c0621d7c877c2e3e247f765af3c04f1adf2b8cd"}, +{"name":"tpm-key_attestation","version":"0.12.0","platform":"ruby","checksum":"e133d80cf24fef0e7a7dfad00fd6aeff01fc79875fbfc66cd8537bbd622b1e6d"}, {"name":"trailblazer-option","version":"0.1.2","platform":"ruby","checksum":"20e4f12ea4e1f718c8007e7944ca21a329eee4eed9e0fa5dde6e8ad8ac4344a3"}, {"name":"train-core","version":"3.4.9","platform":"ruby","checksum":"d7ad8fa9a379c43a30baaaf1141af1cb28349d386c054f7fc81d169a625d6edd"}, {"name":"truncato","version":"0.7.12","platform":"ruby","checksum":"fed9e8a04fa35fd1a64506cd2089761bae4adfe47e756c3ce98a5c43856c9c4c"}, @@ -655,7 +654,7 @@ {"name":"vmstat","version":"2.3.0","platform":"ruby","checksum":"ab5446a3e3bd0a9cdb9d9ac69a0bbd119c4f161d945a0846a519dd7018af656d"}, {"name":"warden","version":"1.2.9","platform":"ruby","checksum":"46684f885d35a69dbb883deabf85a222c8e427a957804719e143005df7a1efd0"}, {"name":"warning","version":"1.3.0","platform":"ruby","checksum":"23695a5d8e50bd5c46068931b529bee0b28e4982cbcefbe77d867800dde8069e"}, -{"name":"webauthn","version":"2.3.0","platform":"ruby","checksum":"96fbee59f4a45219f1dae96f467b693de144f871be9ec6ea357168624dacd89e"}, +{"name":"webauthn","version":"3.0.0","platform":"ruby","checksum":"3f77d422c2a8a4b31e56cf42f83414bd066e0506e9896936e1730262dc4a20e6"}, {"name":"webfinger","version":"1.2.0","platform":"ruby","checksum":"7814ef1c85da47514f65c6e5ca14205fa9ce41ea2a70785e0c872842162852a2"}, {"name":"webmock","version":"3.9.1","platform":"ruby","checksum":"bcf6822456b234fb1bed2b0a89bff31fe0641214b44f6ba4ced2b824cf31337d"}, {"name":"webrick","version":"1.6.1","platform":"ruby","checksum":"0b4d1eab918f5f53333c690ad470825e51844ce9851e403a3fd47d6a84d9d67c"}, diff --git a/Gemfile.lock b/Gemfile.lock index 1d5c01c2b44..028fb1dc681 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,7 +189,7 @@ GEM autoprefixer-rails (10.2.5.1) execjs (> 0) awesome_print (1.9.2) - awrence (1.1.1) + awrence (1.2.1) aws-eventstream (1.2.0) aws-partitions (1.703.0) aws-sdk-cloudformation (1.41.0) @@ -302,9 +302,9 @@ GEM connection_pool (2.3.0) cork (0.3.0) colored2 (~> 3.1) - cose (1.0.0) + cose (1.3.0) cbor (~> 0.5.9) - openssl-signature_algorithm (~> 0.4.0) + openssl-signature_algorithm (~> 1.0) countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) @@ -1045,7 +1045,8 @@ GEM webfinger (>= 1.0.1) openssl (2.2.2) ipaddr - openssl-signature_algorithm (0.4.0) + openssl-signature_algorithm (1.3.0) + openssl (> 2.0) opentracing (0.5.0) optimist (3.0.1) org-ruby (0.9.12) @@ -1339,7 +1340,6 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) sd_notify (0.1.1) - securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) @@ -1477,9 +1477,10 @@ GEM toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - tpm-key_attestation (0.9.0) + tpm-key_attestation (0.12.0) bindata (~> 2.4) - openssl-signature_algorithm (~> 0.4.0) + openssl (> 2.0) + openssl-signature_algorithm (~> 1.0) trailblazer-option (0.1.2) train-core (3.4.9) addressable (~> 2.5) @@ -1556,16 +1557,15 @@ GEM warden (1.2.9) rack (>= 2.0.9) warning (1.3.0) - webauthn (2.3.0) + webauthn (3.0.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) bindata (~> 2.4) cbor (~> 0.5.9) - cose (~> 1.0) - openssl (~> 2.0) + cose (~> 1.1) + openssl (>= 2.2) safety_net_attestation (~> 0.4.0) - securecompare (~> 1.0) - tpm-key_attestation (~> 0.9.0) + tpm-key_attestation (~> 0.12.0) webfinger (1.2.0) activesupport httpclient (>= 2.4) @@ -1894,7 +1894,7 @@ DEPENDENCIES view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) - webauthn (~> 2.3) + webauthn (~> 3.0) webmock (~> 3.9.1) webrick (~> 1.6.1) wikicloth (= 0.8.1) diff --git a/app/assets/javascripts/admin/application_settings/network_outbound.js b/app/assets/javascripts/admin/application_settings/network_outbound.js new file mode 100644 index 00000000000..ad7ed85131c --- /dev/null +++ b/app/assets/javascripts/admin/application_settings/network_outbound.js @@ -0,0 +1,28 @@ +export default () => { + const denyAllRequests = document.querySelector('.js-deny-all-requests'); + + if (!denyAllRequests) { + return; + } + + denyAllRequests.addEventListener('change', () => { + const denyAll = denyAllRequests.checked; + const allowLocalRequests = document.querySelectorAll('.js-allow-local-requests'); + const denyAllRequestsWarning = document.querySelector('.js-deny-all-requests-warning'); + + if (denyAll) { + denyAllRequestsWarning.classList.remove('gl-display-none'); + } else { + denyAllRequestsWarning.classList.add('gl-display-none'); + } + + allowLocalRequests.forEach((allowLocalRequest) => { + /* eslint-disable no-param-reassign */ + if (denyAll) { + allowLocalRequest.checked = false; + } + allowLocalRequest.disabled = denyAll; + /* eslint-enable no-param-reassign */ + }); + }); +}; diff --git a/app/assets/javascripts/pages/admin/application_settings/network/index.js b/app/assets/javascripts/pages/admin/application_settings/network/index.js new file mode 100644 index 00000000000..841c68c5cd0 --- /dev/null +++ b/app/assets/javascripts/pages/admin/application_settings/network/index.js @@ -0,0 +1,3 @@ +import initNetworkOutbound from '~/admin/application_settings/network_outbound'; + +initNetworkOutbound(); diff --git a/app/helpers/sidebars_helper.rb b/app/helpers/sidebars_helper.rb index 17ba56e8a67..823cb9e1de7 100644 --- a/app/helpers/sidebars_helper.rb +++ b/app/helpers/sidebars_helper.rb @@ -83,17 +83,16 @@ module SidebarsHelper end def super_sidebar_nav_panel(nav: nil, project: nil, user: nil, group: nil, current_ref: nil, ref_type: nil) + context_adds = { route_is_active: method(:active_nav_link?), is_super_sidebar: true } case nav when 'project' - context = project_sidebar_context(project, user, current_ref, ref_type: ref_type, - route_is_active: method(:active_nav_link?)) + context = project_sidebar_context(project, user, current_ref, ref_type: ref_type, **context_adds) Sidebars::Projects::SuperSidebarPanel.new(context) when 'group' - context = group_sidebar_context(group, user, route_is_active: method(:active_nav_link?)) + context = group_sidebar_context(group, user, **context_adds) Sidebars::Groups::Panel.new(context) else - Sidebars::YourWork::Panel.new(Sidebars::Context.new(current_user: user, container: nil, - route_is_active: method(:active_nav_link?))) + Sidebars::YourWork::Panel.new(Sidebars::Context.new(current_user: user, container: nil, **context_adds)) end end diff --git a/app/models/ci/catalog/listing.rb b/app/models/ci/catalog/listing.rb new file mode 100644 index 00000000000..99a5230b64e --- /dev/null +++ b/app/models/ci/catalog/listing.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +module Ci + module Catalog + class Listing + # This class is the SSoT to displaying the list of resources in the + # CI/CD Catalog given a namespace as a scope. + # This model is not directly backed by a table and joins catalog resources + # with projects to return relevant data. + def initialize(namespace) + raise ArgumentError, 'Namespace is not a root namespace' unless namespace.root? + + @namespace = namespace + end + + def resources + Ci::Catalog::Resource + .joins(:project).includes(:project) + .merge(Project.in_namespace(namespace.self_and_descendant_ids)) + end + + private + + attr_reader :namespace + end + end +end diff --git a/app/models/ci/catalog/resource.rb b/app/models/ci/catalog/resource.rb new file mode 100644 index 00000000000..1b3dec5f54d --- /dev/null +++ b/app/models/ci/catalog/resource.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Ci + module Catalog + # This class represents a CI/CD Catalog resource. + # A Catalog resource is normally associated to a project. + # This model connects to the `main` database because of its + # dependency on the Project model and its need to join with that table + # in order to generate the CI/CD catalog. + class Resource < ::ApplicationRecord + self.table_name = 'catalog_resources' + + belongs_to :project + end + end +end diff --git a/app/models/ci/runner_machine_build.rb b/app/models/ci/runner_machine_build.rb index ac2b258557a..95418db3619 100644 --- a/app/models/ci/runner_machine_build.rb +++ b/app/models/ci/runner_machine_build.rb @@ -3,16 +3,11 @@ module Ci class RunnerMachineBuild < Ci::ApplicationRecord include Ci::Partitionable - include PartitionedTable self.table_name = :p_ci_runner_machine_builds self.primary_key = :build_id - partitionable scope: :build - partitioned_by :partition_id, - strategy: :ci_sliding_list, - next_partition_if: proc { false }, - detach_partition_if: proc { false } + partitionable scope: :build, partitioned: true belongs_to :build, inverse_of: :runner_machine_build, class_name: 'Ci::Build' belongs_to :runner_machine, inverse_of: :runner_machine_builds, class_name: 'Ci::RunnerMachine' diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index 5df6f774767..02093bdf153 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -118,6 +118,7 @@ module Ci end end + # This will be removed with ci_remove_ensure_stage_service def update_legacy_status set_status(latest_stage_status.to_s) end @@ -151,6 +152,7 @@ module Ci blocked? || skipped? end + # This will be removed with ci_remove_ensure_stage_service def latest_stage_status statuses.latest.composite_status || 'skipped' end diff --git a/app/models/concerns/ci/has_status.rb b/app/models/concerns/ci/has_status.rb index c10a9221efb..2971ecb04b8 100644 --- a/app/models/concerns/ci/has_status.rb +++ b/app/models/concerns/ci/has_status.rb @@ -23,6 +23,7 @@ module Ci UnknownStatusError = Class.new(StandardError) class_methods do + # This will be removed with ci_remove_ensure_stage_service def composite_status Gitlab::Ci::Status::Composite .new(all, with_allow_failure: columns_hash.key?('allow_failure')) diff --git a/app/models/concerns/ci/partitionable.rb b/app/models/concerns/ci/partitionable.rb index fa0c2221968..28cc17432bc 100644 --- a/app/models/concerns/ci/partitionable.rb +++ b/app/models/concerns/ci/partitionable.rb @@ -69,9 +69,10 @@ module Ci end class_methods do - def partitionable(scope:, through: nil) + def partitionable(scope:, through: nil, partitioned: false) handle_partitionable_through(through) handle_partitionable_scope(scope) + handle_partitionable_ddl(partitioned) end private @@ -95,6 +96,17 @@ module Ci end end end + + def handle_partitionable_ddl(partitioned) + return unless partitioned + + include ::PartitionedTable + + partitioned_by :partition_id, + strategy: :ci_sliding_list, + next_partition_if: proc { false }, + detach_partition_if: proc { false } + end end end end diff --git a/app/models/integrations/base_slash_commands.rb b/app/models/integrations/base_slash_commands.rb index 619579a543a..eece67b86d4 100644 --- a/app/models/integrations/base_slash_commands.rb +++ b/app/models/integrations/base_slash_commands.rb @@ -6,8 +6,6 @@ module Integrations class BaseSlashCommands < Integration attribute :category, default: 'chat' - prop_accessor :token - has_many :chat_names, foreign_key: :integration_id, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent def valid_token?(token) @@ -24,18 +22,6 @@ module Integrations false end - def fields - [ - { - type: 'password', - name: 'token', - non_empty_password_title: s_('ProjectService|Enter new token'), - non_empty_password_help: s_('ProjectService|Leave blank to use your current token.'), - placeholder: 'XXxxXXxxXXxxXXxxXXxxXXxx' - } - ] - end - def trigger(params) return unless valid_token?(params[:token]) diff --git a/app/models/integrations/mattermost_slash_commands.rb b/app/models/integrations/mattermost_slash_commands.rb index 62fe4820e55..f5079b9b907 100644 --- a/app/models/integrations/mattermost_slash_commands.rb +++ b/app/models/integrations/mattermost_slash_commands.rb @@ -4,7 +4,11 @@ module Integrations class MattermostSlashCommands < BaseSlashCommands include Ci::TriggersHelper - prop_accessor :token + field :token, + type: 'password', + non_empty_password_title: -> { s_('ProjectService|Enter new token') }, + non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') }, + placeholder: '' def testable? false diff --git a/app/models/integrations/slack_slash_commands.rb b/app/models/integrations/slack_slash_commands.rb index 01a87e8e25e..343c8d68166 100644 --- a/app/models/integrations/slack_slash_commands.rb +++ b/app/models/integrations/slack_slash_commands.rb @@ -4,6 +4,12 @@ module Integrations class SlackSlashCommands < BaseSlashCommands include Ci::TriggersHelper + field :token, + type: 'password', + non_empty_password_title: -> { s_('ProjectService|Enter new token') }, + non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') }, + placeholder: '' + def title 'Slack slash commands' end diff --git a/app/models/project.rb b/app/models/project.rb index a26116ee830..e2f5e51453d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -373,7 +373,6 @@ class Project < ApplicationRecord inverse_of: :project has_many :stages, class_name: 'Ci::Stage', inverse_of: :project has_many :ci_refs, class_name: 'Ci::Ref', inverse_of: :project - has_many :pipeline_metadata, class_name: 'Ci::PipelineMetadata', inverse_of: :project has_many :pending_builds, class_name: 'Ci::PendingBuild' has_many :builds, class_name: 'Ci::Build', inverse_of: :project diff --git a/app/services/ci/pipeline_processing/atomic_processing_service.rb b/app/services/ci/pipeline_processing/atomic_processing_service.rb index 2b8eb104be5..4f2230ea1fc 100644 --- a/app/services/ci/pipeline_processing/atomic_processing_service.rb +++ b/app/services/ci/pipeline_processing/atomic_processing_service.rb @@ -48,10 +48,10 @@ module Ci def update_stage!(stage) # Update processables for a given stage in bulk/slices @collection - .created_processable_ids_for_stage_position(stage.position) + .created_processable_ids_in_stage(stage.position) .in_groups_of(BATCH_SIZE, false) { |ids| update_processables!(ids) } - status = @collection.status_for_stage_position(stage.position) + status = @collection.status_of_stage(stage.position) stage.set_status(status) end @@ -79,29 +79,27 @@ module Ci end def update_processable!(processable) - status = processable_status(processable) - return unless Ci::HasStatus::COMPLETED_STATUSES.include?(status) + previous_status = status_of_previous_processables(processable) + # We do not continue to process the processable if the previous status is not completed + return unless Ci::HasStatus::COMPLETED_STATUSES.include?(previous_status) - # transition status if possible Gitlab::OptimisticLocking.retry_lock(processable, name: 'atomic_processing_update_processable') do |subject| Ci::ProcessBuildService.new(project, subject.user) - .execute(subject, status) + .execute(subject, previous_status) # update internal representation of status - # to make the status change of processable - # to be taken into account during further processing - @collection.set_processable_status( - processable.id, processable.status, processable.lock_version) + # to make the status change of processable to be taken into account during further processing + @collection.set_processable_status(processable.id, processable.status, processable.lock_version) end end - def processable_status(processable) + def status_of_previous_processables(processable) if processable.scheduling_type_dag? # Processable uses DAG, get status of all dependent needs - @collection.status_for_names(processable.aggregated_needs_names.to_a, dag: true) + @collection.status_of_processables(processable.aggregated_needs_names.to_a, dag: true) else # Processable uses Stages, get status of prior stage - @collection.status_for_prior_stage_position(processable.stage_idx.to_i) + @collection.status_of_processables_prior_to_stage(processable.stage_idx.to_i) end end diff --git a/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb b/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb index 676c2ecb257..9738e4e65b7 100644 --- a/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb +++ b/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb @@ -35,40 +35,40 @@ module Ci status_for_array(all_statuses, dag: false) end + # This methods gets composite status for processables at a given stage + def status_of_stage(stage_position) + strong_memoize("status_of_stage_#{stage_position}") do + stage_statuses = all_statuses_grouped_by_stage_position[stage_position].to_a + + status_for_array(stage_statuses.flatten, dag: false) + end + end + # This methods gets composite status for processables with given names - def status_for_names(names, dag:) + def status_of_processables(names, dag:) name_statuses = all_statuses_by_name.slice(*names) status_for_array(name_statuses.values, dag: dag) end # This methods gets composite status for processables before given stage - def status_for_prior_stage_position(position) - strong_memoize("status_for_prior_stage_position_#{position}") do + def status_of_processables_prior_to_stage(stage_position) + strong_memoize("status_of_processables_prior_to_stage_#{stage_position}") do stage_statuses = all_statuses_grouped_by_stage_position - .select { |stage_position, _| stage_position < position } + .select { |position, _| position < stage_position } status_for_array(stage_statuses.values.flatten, dag: false) end end # This methods gets a list of processables for a given stage - def created_processable_ids_for_stage_position(current_position) - all_statuses_grouped_by_stage_position[current_position] + def created_processable_ids_in_stage(stage_position) + all_statuses_grouped_by_stage_position[stage_position] .to_a .select { |processable| processable[:status] == 'created' } .map { |processable| processable[:id] } end - # This methods gets composite status for processables at a given stage - def status_for_stage_position(current_position) - strong_memoize("status_for_stage_position_#{current_position}") do - stage_statuses = all_statuses_grouped_by_stage_position[current_position].to_a - - status_for_array(stage_statuses.flatten, dag: false) - end - end - # This method returns a list of all processable, that are to be processed def processing_processables all_statuses.lazy.reject { |status| status[:processed] } diff --git a/app/services/ci/process_build_service.rb b/app/services/ci/process_build_service.rb index a5300cfd29f..afaf18a4de2 100644 --- a/app/services/ci/process_build_service.rb +++ b/app/services/ci/process_build_service.rb @@ -2,40 +2,40 @@ module Ci class ProcessBuildService < BaseService - def execute(build, current_status) - if valid_statuses_for_build(build).include?(current_status) - process(build) + def execute(processable, current_status) + if valid_statuses_for_processable(processable).include?(current_status) + process(processable) true else - build.skip + processable.skip false end end private - def process(build) - return enqueue(build) if build.enqueue_immediately? + def process(processable) + return enqueue(processable) if processable.enqueue_immediately? - if build.schedulable? - build.schedule - elsif build.action? - build.actionize + if processable.schedulable? + processable.schedule + elsif processable.action? + processable.actionize else - enqueue(build) + enqueue(processable) end end - def enqueue(build) - return build.drop!(:failed_outdated_deployment_job) if build.outdated_deployment? + def enqueue(processable) + return processable.drop!(:failed_outdated_deployment_job) if processable.outdated_deployment? - build.enqueue + processable.enqueue end - def valid_statuses_for_build(build) - case build.when + def valid_statuses_for_processable(processable) + case processable.when when 'on_success', 'manual', 'delayed' - build.scheduling_type_dag? ? %w[success] : %w[success skipped] + processable.scheduling_type_dag? ? %w[success] : %w[success skipped] when 'on_failure' %w[failed] when 'always' diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index 1821c8ef4bb..566bcc5b8e0 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -1,25 +1,37 @@ +- deny_all_requests = Feature.enabled?(:deny_all_requests) && @application_setting.deny_all_requests + = gitlab_ui_form_for @application_setting, url: network_admin_application_settings_path(anchor: 'js-outbound-settings'), html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset .form-group + - if Feature.enabled?(:deny_all_requests) + = f.gitlab_ui_checkbox_component :deny_all_requests, + s_('OutboundRequests|Block all requests, except for IP addresses, IP ranges, and domain names defined in the allowlist'), + checkbox_options: { class: 'js-deny-all-requests' } + = render Pajamas::AlertComponent.new(variant: :warning, + dismissible: false, + alert_options: { class: "gl-mb-3 js-deny-all-requests-warning #{'gl-display-none' unless deny_all_requests}" }) do |c| + = c.body do + = s_('OutboundRequests|Webhooks and integrations might not work properly.') = f.gitlab_ui_checkbox_component :allow_local_requests_from_web_hooks_and_services, - s_('OutboundRequests|Allow requests to the local network from web hooks and services'), - checkbox_options: { data: { qa_selector: 'allow_requests_from_services_checkbox' } } + s_('OutboundRequests|Allow requests to the local network from webhooks and integrations'), + checkbox_options: { disabled: deny_all_requests, class: 'js-allow-local-requests', data: { qa_selector: 'allow_requests_from_services_checkbox' } } = f.gitlab_ui_checkbox_component :allow_local_requests_from_system_hooks, - s_('OutboundRequests|Allow requests to the local network from system hooks') + s_('OutboundRequests|Allow requests to the local network from system hooks'), + checkbox_options: { disabled: deny_all_requests, class: 'js-allow-local-requests' } .form-group = f.label :outbound_local_requests_allowlist_raw, class: 'label-bold' do - = s_('OutboundRequests|Local IP addresses and domain names that hooks and services may access') + = s_('OutboundRequests|Local IP addresses and domain names that hooks and integrations can access') = f.text_area :outbound_local_requests_allowlist_raw, placeholder: "example.com, 192.168.1.1, xn--itlab-j1a.com", class: 'form-control gl-form-input', rows: 8 %span.form-text.text-muted - = s_('OutboundRequests|Requests to these domains and IP addresses are accessible to both system hooks and web hooks even when local requests are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 and 127.0.0.0/28 are supported. Domain wildcards are not supported. To separate entries use commas, semicolons, or newlines. The allowlist can hold a maximum of 1000 entries. Domains must be IDNA encoded.') + = s_('OutboundRequests|Requests can be made to these IP addresses and domains even when local requests are not allowed. IP ranges such as %{code_start}1:0:0:0:0:0:0:0/124%{code_end} and %{code_start}127.0.0.0/28%{code_end} are supported. Domain wildcards are not supported. To separate entries, use commas, semicolons, or newlines. The allowlist can have a maximum of 1000 entries. Domains must be IDNA-encoded.').html_safe % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } = link_to _('Learn more.'), help_page_path('security/webhooks.md', anchor: 'create-an-allowlist-for-local-requests'), target: '_blank', rel: 'noopener noreferrer' .form-group = f.gitlab_ui_checkbox_component :dns_rebinding_protection_enabled, - s_('OutboundRequests|Enforce DNS rebinding attack protection'), - help_text: s_('OutboundRequests|Resolve IP addresses once and uses them to submit requests.') + s_('OutboundRequests|Enforce DNS-rebinding attack protection'), + help_text: s_('OutboundRequests|Resolve IP addresses for outbound requests to prevent DNS-rebinding attacks.') = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/network.html.haml b/app/views/admin/application_settings/network.html.haml index fe5f0960d01..b20fc703f18 100644 --- a/app/views/admin/application_settings/network.html.haml +++ b/app/views/admin/application_settings/network.html.haml @@ -92,7 +92,7 @@ = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded_by_default? ? _('Collapse') : _('Expand') %p - = s_('OutboundRequests|Allow requests to the local network from hooks and services.') + = s_('OutboundRequests|Allow requests to the local network from hooks and integrations.') = link_to _('Learn more.'), help_page_path('security/webhooks.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'outbound' diff --git a/app/workers/stage_update_worker.rb b/app/workers/stage_update_worker.rb index e0d8958fc80..97da76346b6 100644 --- a/app/workers/stage_update_worker.rb +++ b/app/workers/stage_update_worker.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +# This will be scheduled to be removed after removing the FF ci_remove_ensure_stage_service class StageUpdateWorker include ApplicationWorker diff --git a/config/feature_flags/development/deny_all_requests.yml b/config/feature_flags/development/deny_all_requests.yml new file mode 100644 index 00000000000..74444b23d3e --- /dev/null +++ b/config/feature_flags/development/deny_all_requests.yml @@ -0,0 +1,8 @@ +--- +name: deny_all_requests +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110599 +rollout_issue_url: +milestone: '15.9' +type: development +group: group::integrations +default_enabled: false diff --git a/config/metrics/license/20230228110448_installation_creation_date.yml b/config/metrics/license/20230228110448_installation_creation_date.yml new file mode 100644 index 00000000000..53f9438ba0f --- /dev/null +++ b/config/metrics/license/20230228110448_installation_creation_date.yml @@ -0,0 +1,22 @@ +--- +key_path: installation_creation_date +description: "The date and time the instance was installed" +product_section: analytics +product_stage: analytics +product_group: product_intelligence +value_type: string +status: active +milestone: "15.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113090 +time_frame: none +data_source: database +data_category: operational +instrumentation_class: InstallationCreationDateMetric +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/doc/api/settings.md b/doc/api/settings.md index 2b7bb3ab626..19888b7bf68 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -269,9 +269,9 @@ listed in the descriptions of the relevant settings. | `akismet_api_key` | string | required by: `akismet_enabled` | API key for Akismet spam protection. | | `akismet_enabled` | boolean | no | (**If enabled, requires:** `akismet_api_key`) Enable or disable Akismet spam protection. | | `allow_group_owners_to_manage_ldap` **(PREMIUM)** | boolean | no | Set to `true` to allow group owners to manage LDAP. | -| `allow_local_requests_from_hooks_and_services` | boolean | no | (Deprecated: Use `allow_local_requests_from_web_hooks_and_services` instead) Allow requests to the local network from hooks and services. | +| `allow_local_requests_from_hooks_and_services` | boolean | no | (Deprecated: Use `allow_local_requests_from_web_hooks_and_services` instead) Allow requests to the local network from webhooks and integrations. | | `allow_local_requests_from_system_hooks` | boolean | no | Allow requests to the local network from system hooks. | -| `allow_local_requests_from_web_hooks_and_services` | boolean | no | Allow requests to the local network from web hooks and services. | +| `allow_local_requests_from_web_hooks_and_services` | boolean | no | Allow requests to the local network from webhooks and integrations. | | `allow_runner_registration_token` | boolean | no | Allow using a registration token to create a runner. Defaults to `true`. | | `archive_builds_in_human_readable` | string | no | Set the duration for which the jobs are considered as old and expired. After that time passes, the jobs are archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>. | | `asset_proxy_enabled` | boolean | no | (**If enabled, requires:** `asset_proxy_url`) Enable proxying of assets. GitLab restart is required to apply changes. | @@ -317,7 +317,7 @@ listed in the descriptions of the relevant settings. | `disable_feed_token` | boolean | no | Disable display of RSS/Atom and calendar feed tokens. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/231493) in GitLab 13.7. | | `disable_personal_access_token` **(PREMIUM SELF)** | boolean | no | Disable personal access tokens. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/384201) in GitLab 15.7. | | `disabled_oauth_sign_in_sources` | array of strings | no | Disabled OAuth sign-in sources. | -| `dns_rebinding_protection_enabled` | boolean | no | Enforce DNS rebinding attack protection. | +| `dns_rebinding_protection_enabled` | boolean | no | Enforce DNS-rebinding attack protection. | | `domain_denylist_enabled` | boolean | no | (**If enabled, requires:** `domain_denylist`) Allows blocking sign-ups from emails from specific domains. | | `domain_denylist` | array of strings | no | Users with email addresses that match these domains **cannot** sign up. Wildcards allowed. Use separate lines for multiple entries. For example: `domain.com`, `*.domain.com`. | | `domain_allowlist` | array of strings | no | Force people to use only corporate emails for sign-up. Default is `null`, meaning there is no restriction. | @@ -419,7 +419,7 @@ listed in the descriptions of the relevant settings. | `maven_package_requests_forwarding` **(PREMIUM)** | boolean | no | Use repo.maven.apache.org as a default remote repository when the package is not found in the GitLab Package Registry for Maven. | | `npm_package_requests_forwarding` **(PREMIUM)** | boolean | no | Use npmjs.org as a default remote repository when the package is not found in the GitLab Package Registry for npm. | | `pypi_package_requests_forwarding` **(PREMIUM)** | boolean | no | Use pypi.org as a default remote repository when the package is not found in the GitLab Package Registry for PyPI. | -| `outbound_local_requests_whitelist` | array of strings | no | Define a list of trusted domains or IP addresses to which local requests are allowed when local requests for hooks and services are disabled. +| `outbound_local_requests_whitelist` | array of strings | no | Define a list of trusted domains or IP addresses to which local requests are allowed when local requests for webhooks and integrations are disabled. | `pages_domain_verification_enabled` | boolean | no | Require users to prove ownership of custom domains. Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled. | | `password_authentication_enabled_for_git` | boolean | no | Enable authentication for Git over HTTP(S) via a GitLab account password. Default is `true`. | | `password_authentication_enabled_for_web` | boolean | no | Enable authentication for the web interface via a GitLab account password. Default is `true`. | diff --git a/doc/development/integrations/jenkins.md b/doc/development/integrations/jenkins.md index 6baccdca327..8b05cc3168e 100644 --- a/doc/development/integrations/jenkins.md +++ b/doc/development/integrations/jenkins.md @@ -26,9 +26,9 @@ GitLab does not allow requests to localhost or the local network by default. Whe 1. Log into your GitLab instance as an administrator. 1. On the top bar, select **Main menu > Admin**. 1. On the left sidebar, select **Settings > Network**. -1. Expand **Outbound requests** and check the following checkboxes: +1. Expand **Outbound requests**, and select the following checkboxes: - - **Allow requests to the local network from web hooks and services** + - **Allow requests to the local network from webhooks and integrations** - **Allow requests to the local network from system hooks** For more details about GitLab webhooks, see [Webhooks and insecure internal web services](../../security/webhooks.md). diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md index eeb6720dfb7..f5b16ccaba6 100644 --- a/doc/security/webhooks.md +++ b/doc/security/webhooks.md @@ -45,7 +45,7 @@ To allow access to these addresses: 1. On the top bar, select **Main menu > Admin**. 1. On the left sidebar, select **Settings > Network**. 1. Expand **Outbound requests**. -1. Select the **Allow requests to the local network from web hooks and services** checkbox. +1. Select the **Allow requests to the local network from webhooks and integrations** checkbox. ## Prevent system hook requests to local network diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index 5a550f15a41..9a749fa4d2c 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -130,7 +130,7 @@ The **Network** settings contain: - [Search rate limits](../../../administration/instance_limits.md#search-rate-limit) - Configure global search request rate limits for authenticated and unauthenticated users. - [Deprecated API Rate Limits](deprecated_api_rate_limits.md) - Configure specific limits for deprecated API requests that supersede the user and IP rate limits. -- [Outbound requests](../../../security/webhooks.md) - Allow requests to the local network from hooks and services. +- [Outbound requests](../../../security/webhooks.md) - Allow requests to the local network from webhooks and integrations. - [Protected Paths](protected_paths.md) - Configure paths to be protected by Rack Attack. - [Incident Management Limits](../../../operations/incident_management/index.md) - Limit the number of inbound alerts that can be sent to a project. diff --git a/lib/gitlab/ci/status/composite.rb b/lib/gitlab/ci/status/composite.rb index 021dd8bcf9d..002bd846ab1 100644 --- a/lib/gitlab/ci/status/composite.rb +++ b/lib/gitlab/ci/status/composite.rb @@ -7,6 +7,7 @@ module Gitlab include Gitlab::Utils::StrongMemoize # This class accepts an array of arrays/hashes/or objects + # `with_allow_failure` will be removed when deleting ci_remove_ensure_stage_service def initialize(all_statuses, with_allow_failure: true, dag: false) unless all_statuses.respond_to?(:pluck) raise ArgumentError, "all_statuses needs to respond to `.pluck`" @@ -26,6 +27,12 @@ module Gitlab # 2. In other cases we assume that status is of that type # based on what statuses are no longer valid based on the # data set that we have + # + # This method is used for two cases: + # 1. When it is called for a stage or a pipeline (with `all_statuses` from all jobs in a stage or a pipeline), + # then, the returned status is assigned to the stage or pipeline. + # 2. When it is called for a job (with `all_statuses` from all previous jobs or all needed jobs), + # then, the returned status is used to determine if the job is processed or not. # rubocop: disable Metrics/CyclomaticComplexity # rubocop: disable Metrics/PerceivedComplexity def status diff --git a/lib/gitlab/database/partitioning/ci_sliding_list_strategy.rb b/lib/gitlab/database/partitioning/ci_sliding_list_strategy.rb index 67cf7018ded..69a69091b5c 100644 --- a/lib/gitlab/database/partitioning/ci_sliding_list_strategy.rb +++ b/lib/gitlab/database/partitioning/ci_sliding_list_strategy.rb @@ -5,9 +5,11 @@ module Gitlab module Partitioning class CiSlidingListStrategy < SlidingListStrategy def initial_partition - partition_name = [table_name.to_s.delete_prefix('p_'), 100].join('_') + partition_for(100) + end - SingleNumericListPartition.new(table_name, 100, partition_name: partition_name) + def next_partition + partition_for(active_partition.value + 1) end def validate_and_fix; end @@ -21,6 +23,17 @@ module Gitlab private def ensure_partitioning_column_ignored_or_readonly!; end + + def partition_for(value) + SingleNumericListPartition.new(table_name, value, partition_name: partition_name(value)) + end + + def partition_name(value) + [ + table_name.to_s.delete_prefix('p_'), + value + ].join('_') + end end end end diff --git a/lib/gitlab/usage/metrics/instrumentations/installation_creation_date_metric.rb b/lib/gitlab/usage/metrics/instrumentations/installation_creation_date_metric.rb new file mode 100644 index 00000000000..c2ca62f9eba --- /dev/null +++ b/lib/gitlab/usage/metrics/instrumentations/installation_creation_date_metric.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Gitlab + module Usage + module Metrics + module Instrumentations + class InstallationCreationDateMetric < GenericMetric + value do + User.where(id: 1).pick(:created_at) + end + end + end + end + end +end diff --git a/lib/sidebars/context.rb b/lib/sidebars/context.rb index 5db05932265..b49776bed10 100644 --- a/lib/sidebars/context.rb +++ b/lib/sidebars/context.rb @@ -6,11 +6,12 @@ # values where the logic is in helpers. module Sidebars class Context - attr_reader :current_user, :container, :route_is_active + attr_reader :current_user, :container, :route_is_active, :is_super_sidebar def initialize(current_user:, container:, **args) @current_user = current_user @container = container + @is_super_sidebar = false args.each do |key, value| singleton_class.public_send(:attr_reader, key) # rubocop:disable GitlabSecurity/PublicSend diff --git a/lib/sidebars/your_work/panel.rb b/lib/sidebars/your_work/panel.rb index f7dd8874f75..5f917976872 100644 --- a/lib/sidebars/your_work/panel.rb +++ b/lib/sidebars/your_work/panel.rb @@ -41,3 +41,4 @@ module Sidebars end end end +Sidebars::YourWork::Panel.prepend_mod_with('Sidebars::YourWork::Panel') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5a0a8125542..d2d43c5a255 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6374,6 +6374,9 @@ msgstr "" msgid "Be careful. Renaming a project's repository can have unintended side effects." msgstr "" +msgid "Because you are over the %{free_user_limit} user limit, your top-level group, including any subgroups and projects, will be placed in a %{readonly_link_start}read-only state%{link_end} soon. To retain write access, reduce the number of users of your top-level group to %{free_user_limit} or less, or purchase a paid tier. To minimize the impact to your operations, GitLab is offering a %{promotion_link_start}one-time discount%{link_end} for a new purchase of a one-year subscription of GitLab Premium SaaS." +msgstr "" + msgid "Because you enabled auto-banning, we have also automatically banned this user from %{scope}. If this is a mistake, you can %{link_start}unban them%{link_end}." msgstr "" @@ -19110,11 +19113,6 @@ msgstr "" msgid "GitLab will create a branch in your fork and start a merge request." msgstr "" -msgid "GitLab will enforce this limit in the future. If you are over %{free_user_limit} user when enforcement begins, your top-level group, including any subgroups and projects, will be placed in a %{link_start}read-only%{link_end} state. To avoid being placed in a read-only state, reduce your top-level group to %{free_user_limit} user or less or purchase a paid tier." -msgid_plural "GitLab will enforce this limit in the future. If you are over %{free_user_limit} users when enforcement begins, your top-level group, including any subgroups and projects, will be placed in a %{link_start}read-only%{link_end} state. To avoid being placed in a read-only state, reduce your top-level group to %{free_user_limit} users or less or purchase a paid tier." -msgstr[0] "" -msgstr[1] "" - msgid "GitLab.com (SaaS)" msgstr "" @@ -30041,28 +30039,34 @@ msgstr "" msgid "Out-of-compliance with this project's policies and should be removed" msgstr "" -msgid "OutboundRequests|Allow requests to the local network from hooks and services." +msgid "OutboundRequests|Allow requests to the local network from hooks and integrations." msgstr "" msgid "OutboundRequests|Allow requests to the local network from system hooks" msgstr "" -msgid "OutboundRequests|Allow requests to the local network from web hooks and services" +msgid "OutboundRequests|Allow requests to the local network from webhooks and integrations" msgstr "" -msgid "OutboundRequests|Enforce DNS rebinding attack protection" +msgid "OutboundRequests|Block all requests, except for IP addresses, IP ranges, and domain names defined in the allowlist" msgstr "" -msgid "OutboundRequests|Local IP addresses and domain names that hooks and services may access" +msgid "OutboundRequests|Enforce DNS-rebinding attack protection" +msgstr "" + +msgid "OutboundRequests|Local IP addresses and domain names that hooks and integrations can access" msgstr "" msgid "OutboundRequests|Outbound requests" msgstr "" -msgid "OutboundRequests|Requests to these domains and IP addresses are accessible to both system hooks and web hooks even when local requests are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 and 127.0.0.0/28 are supported. Domain wildcards are not supported. To separate entries use commas, semicolons, or newlines. The allowlist can hold a maximum of 1000 entries. Domains must be IDNA encoded." +msgid "OutboundRequests|Requests can be made to these IP addresses and domains even when local requests are not allowed. IP ranges such as %{code_start}1:0:0:0:0:0:0:0/124%{code_end} and %{code_start}127.0.0.0/28%{code_end} are supported. Domain wildcards are not supported. To separate entries, use commas, semicolons, or newlines. The allowlist can have a maximum of 1000 entries. Domains must be IDNA-encoded." +msgstr "" + +msgid "OutboundRequests|Resolve IP addresses for outbound requests to prevent DNS-rebinding attacks." msgstr "" -msgid "OutboundRequests|Resolve IP addresses once and uses them to submit requests." +msgid "OutboundRequests|Webhooks and integrations might not work properly." msgstr "" msgid "OutdatedBrowser|GitLab may not work properly, because you are using an outdated web browser." @@ -32671,9 +32675,15 @@ msgstr "" msgid "ProductAnalytics|Compares pageviews of all pages against each other" msgstr "" +msgid "ProductAnalytics|Configure Dashboard Project" +msgstr "" + msgid "ProductAnalytics|Creating your product analytics instance..." msgstr "" +msgid "ProductAnalytics|Custom dashboards" +msgstr "" + msgid "ProductAnalytics|Data" msgstr "" @@ -32707,6 +32717,9 @@ msgstr "" msgid "ProductAnalytics|Feature usage" msgstr "" +msgid "ProductAnalytics|For being able to create your own dashboards please configure a special project to store your dashboards." +msgstr "" + msgid "ProductAnalytics|For the product analytics dashboard to start showing you some data, you need to add the analytics tracking code to your project." msgstr "" @@ -46270,6 +46283,9 @@ msgstr "" msgid "Usage statistics" msgstr "" +msgid "UsageQuotas|An error occurred loading the transfer data. Please refresh the page to try again." +msgstr "" + msgid "UsageQuotas|The project-level storage statistics for the Container Registry are directional only and do not include savings for instance-wide deduplication." msgstr "" @@ -46441,6 +46457,9 @@ msgstr "" msgid "UsageQuota|This table omits projects that used 0 CI/CD minutes or 0 shared runners duration" msgstr "" +msgid "UsageQuota|Transfer" +msgstr "" + msgid "UsageQuota|Uploads" msgstr "" @@ -50131,6 +50150,9 @@ msgstr "" msgid "Your top-level group %{namespace_name} is over the %{free_user_limit} user limit" msgstr "" +msgid "Your top-level group %{namespace_name} will move to a read-only state soon" +msgstr "" + msgid "Your top-level group is over the user and storage limits and has been placed in a read-only state." msgstr "" diff --git a/qa/Gemfile b/qa/Gemfile index d5d9b77b82a..3201d6d1b17 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -22,7 +22,7 @@ gem 'parallel', '~> 1.22', '>= 1.22.1' gem 'rainbow', '~> 3.1.1' gem 'rspec-parameterized', '~> 1.0.0' gem 'octokit', '~> 6.0.1' -gem "faraday-retry", "~> 2.0" +gem "faraday-retry", "~> 2.1" gem 'webdrivers', '~> 5.2' gem 'zeitwerk', '~> 2.6', '>= 2.6.7' gem 'influxdb-client', '~> 2.9' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 10fff3de272..52ac2d75708 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -69,7 +69,7 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.0) - faraday-retry (2.0.0) + faraday-retry (2.1.0) faraday (~> 2.0) ffi (1.15.5) ffi-compiler (1.0.1) @@ -314,7 +314,7 @@ DEPENDENCIES confiner (~> 0.4) deprecation_toolkit (~> 2.0.3) faker (~> 3.1, >= 3.1.1) - faraday-retry (~> 2.0) + faraday-retry (~> 2.1) fog-core (= 2.1.0) fog-google (~> 1.19) gitlab-qa (~> 9, >= 9.1.0) diff --git a/spec/factories/ci/catalog/resources.rb b/spec/factories/ci/catalog/resources.rb new file mode 100644 index 00000000000..66c2e58cdd9 --- /dev/null +++ b/spec/factories/ci/catalog/resources.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :catalog_resource, class: 'Ci::Catalog::Resource' do + project factory: :project + end +end diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 7c6f2dca7b8..b1da1d556a0 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -662,15 +662,19 @@ RSpec.describe 'Admin updates settings', feature_category: :shared do end context 'Network page' do + before do + stub_feature_flags(deny_all_requests: false) + end + it 'changes Outbound requests settings' do visit network_admin_application_settings_path page.within('.as-outbound') do - check 'Allow requests to the local network from web hooks and services' + check 'Allow requests to the local network from webhooks and integrations' # Enabled by default uncheck 'Allow requests to the local network from system hooks' # Enabled by default - uncheck 'Enforce DNS rebinding attack protection' + uncheck 'Enforce DNS-rebinding attack protection' click_button 'Save changes' end diff --git a/spec/features/projects/integrations/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/integrations/user_activates_mattermost_slash_command_spec.rb index 16c7a3ff226..07cb138c414 100644 --- a/spec/features/projects/integrations/user_activates_mattermost_slash_command_spec.rb +++ b/spec/features/projects/integrations/user_activates_mattermost_slash_command_spec.rb @@ -145,7 +145,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js, feature_category: :integ it 'shows a token placeholder' do token_placeholder = find_field('service_token')['placeholder'] - expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx') + expect(token_placeholder).to eq('') end end end diff --git a/spec/features/projects/integrations/user_activates_slack_slash_command_spec.rb b/spec/features/projects/integrations/user_activates_slack_slash_command_spec.rb index 0f6d721565e..38491501c65 100644 --- a/spec/features/projects/integrations/user_activates_slack_slash_command_spec.rb +++ b/spec/features/projects/integrations/user_activates_slack_slash_command_spec.rb @@ -12,7 +12,7 @@ RSpec.describe 'Slack slash commands', :js, feature_category: :integrations do it 'shows a token placeholder' do token_placeholder = find_field('Token')['placeholder'] - expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx') + expect(token_placeholder).to eq('') end it 'shows a help message' do diff --git a/spec/frontend/admin/application_settings/network_outbound_spec.js b/spec/frontend/admin/application_settings/network_outbound_spec.js new file mode 100644 index 00000000000..0e3a2dfdfd4 --- /dev/null +++ b/spec/frontend/admin/application_settings/network_outbound_spec.js @@ -0,0 +1,70 @@ +import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; + +import initNetworkOutbound from '~/admin/application_settings/network_outbound'; + +describe('initNetworkOutbound', () => { + const findAllowCheckboxes = () => document.querySelectorAll('.js-allow-local-requests'); + const findDenyCheckbox = () => document.querySelector('.js-deny-all-requests'); + const findWarningBanner = () => document.querySelector('.js-deny-all-requests-warning'); + const clickDenyCheckbox = () => { + findDenyCheckbox().click(); + }; + + const createFixture = (denyAll = false) => { + setHTMLFixture(` + <input class="js-deny-all-requests" type="checkbox" name="application_setting[deny_all_requests]" ${ + denyAll ? 'checked="checked"' : '' + }/> + <div class="js-deny-all-requests-warning ${denyAll ? '' : 'gl-display-none'}"></div> + <input class="js-allow-local-requests" type="checkbox" name="application_setting[allow_local_requests_from_web_hooks_and_services]" /> + <input class="js-allow-local-requests" type="checkbox" name="application_setting[allow_local_requests_from_system_hooks]" /> + `); + }; + + afterEach(() => { + resetHTMLFixture(); + }); + + describe('when the checkbox is not checked', () => { + beforeEach(() => { + createFixture(); + initNetworkOutbound(); + }); + + it('shows banner and disables allow checkboxes on change', () => { + expect(findDenyCheckbox().checked).toBe(false); + expect(findWarningBanner().classList).toContain('gl-display-none'); + + clickDenyCheckbox(); + + expect(findDenyCheckbox().checked).toBe(true); + expect(findWarningBanner().classList).not.toContain('gl-display-none'); + const allowCheckboxes = findAllowCheckboxes(); + allowCheckboxes.forEach((checkbox) => { + expect(checkbox.checked).toBe(false); + expect(checkbox.disabled).toBe(true); + }); + }); + }); + + describe('when the checkbox is checked', () => { + beforeEach(() => { + createFixture(true); + initNetworkOutbound(); + }); + + it('hides banner and enables allow checkboxes on change', () => { + expect(findDenyCheckbox().checked).toBe(true); + expect(findWarningBanner().classList).not.toContain('gl-display-none'); + + clickDenyCheckbox(); + + expect(findDenyCheckbox().checked).toBe(false); + expect(findWarningBanner().classList).toContain('gl-display-none'); + const allowCheckboxes = findAllowCheckboxes(); + allowCheckboxes.forEach((checkbox) => { + expect(checkbox.disabled).toBe(false); + }); + }); + }); +}); diff --git a/spec/lib/gitlab/database/partitioning/ci_sliding_list_strategy_spec.rb b/spec/lib/gitlab/database/partitioning/ci_sliding_list_strategy_spec.rb new file mode 100644 index 00000000000..f415e892818 --- /dev/null +++ b/spec/lib/gitlab/database/partitioning/ci_sliding_list_strategy_spec.rb @@ -0,0 +1,178 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::Database::Partitioning::CiSlidingListStrategy, feature_category: :database do + let(:connection) { ActiveRecord::Base.connection } + let(:table_name) { :_test_gitlab_ci_partitioned_test } + let(:model) { class_double(ApplicationRecord, table_name: table_name, connection: connection) } + let(:next_partition_if) { nil } + let(:detach_partition_if) { nil } + + subject(:strategy) do + described_class.new(model, :partition, + next_partition_if: next_partition_if, + detach_partition_if: detach_partition_if) + end + + before do + next if table_name.to_s.starts_with?('p_') + + connection.execute(<<~SQL) + create table #{table_name} + ( + id serial not null, + partition_id bigint not null, + created_at timestamptz not null, + primary key (id, partition_id) + ) + partition by list(partition_id); + + create table #{table_name}_100 + partition of #{table_name} for values in (100); + + create table #{table_name}_101 + partition of #{table_name} for values in (101); + SQL + end + + describe '#current_partitions' do + it 'detects both partitions' do + expect(strategy.current_partitions).to eq( + [ + Gitlab::Database::Partitioning::SingleNumericListPartition.new( + table_name, 100, partition_name: "#{table_name}_100" + ), + Gitlab::Database::Partitioning::SingleNumericListPartition.new( + table_name, 101, partition_name: "#{table_name}_101" + ) + ]) + end + end + + describe '#validate_and_fix' do + it 'does not call change_column_default' do + expect(strategy.model.connection).not_to receive(:change_column_default) + + strategy.validate_and_fix + end + end + + describe '#active_partition' do + it 'is the partition with the largest value' do + expect(strategy.active_partition.value).to eq(101) + end + end + + describe '#missing_partitions' do + context 'when next_partition_if returns true' do + let(:next_partition_if) { proc { true } } + + it 'is a partition definition for the next partition in the series' do + extra = strategy.missing_partitions + + expect(extra.length).to eq(1) + expect(extra.first.value).to eq(102) + end + end + + context 'when next_partition_if returns false' do + let(:next_partition_if) { proc { false } } + + it 'is empty' do + expect(strategy.missing_partitions).to be_empty + end + end + + context 'when there are no partitions for the table' do + it 'returns a partition for value 1' do + connection.execute("drop table #{table_name}_100; drop table #{table_name}_101;") + + missing_partitions = strategy.missing_partitions + + expect(missing_partitions.size).to eq(1) + missing_partition = missing_partitions.first + + expect(missing_partition.value).to eq(100) + end + end + end + + describe '#extra_partitions' do + context 'when all partitions are true for detach_partition_if' do + let(:detach_partition_if) { ->(_p) { true } } + + it { expect(strategy.extra_partitions).to be_empty } + end + + context 'when all partitions are false for detach_partition_if' do + let(:detach_partition_if) { proc { false } } + + it { expect(strategy.extra_partitions).to be_empty } + end + end + + describe '#initial_partition' do + it 'starts with the value 100', :aggregate_failures do + initial_partition = strategy.initial_partition + expect(initial_partition.value).to eq(100) + expect(initial_partition.table).to eq(strategy.table_name) + expect(initial_partition.partition_name).to eq("#{strategy.table_name}_100") + end + + context 'with routing tables' do + let(:table_name) { :p_test_gitlab_ci_partitioned_test } + + it 'removes the prefix', :aggregate_failures do + initial_partition = strategy.initial_partition + + expect(initial_partition.value).to eq(100) + expect(initial_partition.table).to eq(strategy.table_name) + expect(initial_partition.partition_name).to eq('test_gitlab_ci_partitioned_test_100') + end + end + end + + describe '#next_partition' do + before do + allow(strategy) + .to receive(:active_partition) + .and_return(instance_double(Gitlab::Database::Partitioning::SingleNumericListPartition, value: 105)) + end + + it 'is one after the active partition', :aggregate_failures do + next_partition = strategy.next_partition + + expect(next_partition.value).to eq(106) + expect(next_partition.table).to eq(strategy.table_name) + expect(next_partition.partition_name).to eq("#{strategy.table_name}_106") + end + + context 'with routing tables' do + let(:table_name) { :p_test_gitlab_ci_partitioned_test } + + it 'removes the prefix', :aggregate_failures do + next_partition = strategy.next_partition + + expect(next_partition.value).to eq(106) + expect(next_partition.table).to eq(strategy.table_name) + expect(next_partition.partition_name).to eq('test_gitlab_ci_partitioned_test_106') + end + end + end + + describe '#ensure_partitioning_column_ignored_or_readonly!' do + it 'does not raise when the column is not ignored' do + expect do + Class.new(ApplicationRecord) do + include PartitionedTable + + partitioned_by :partition_id, + strategy: :ci_sliding_list, + next_partition_if: proc { false }, + detach_partition_if: proc { false } + end + end.not_to raise_error + end + end +end diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/installation_creation_date_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/installation_creation_date_metric_spec.rb new file mode 100644 index 00000000000..ff6be56c13f --- /dev/null +++ b/spec/lib/gitlab/usage/metrics/instrumentations/installation_creation_date_metric_spec.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::Usage::Metrics::Instrumentations::InstallationCreationDateMetric, + feature_category: :service_ping do + context 'with a root user' do + let_it_be(:root) { create(:user, id: 1) } + let_it_be(:expected_value) { root.reload.created_at } # reloading to get the timestamp from the database + + it_behaves_like 'a correct instrumented metric value', { time_frame: 'all', data_source: 'database' } + end + + context 'without a root user' do + let_it_be(:another_user) { create(:user, id: 2) } + let_it_be(:expected_value) { nil } + + it_behaves_like 'a correct instrumented metric value', { time_frame: 'all', data_source: 'database' } + end +end diff --git a/spec/models/ci/catalog/listing_spec.rb b/spec/models/ci/catalog/listing_spec.rb new file mode 100644 index 00000000000..b6a9372c8b9 --- /dev/null +++ b/spec/models/ci/catalog/listing_spec.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Ci::Catalog::Listing, feature_category: :pipeline_composition do + let_it_be(:namespace) { create(:namespace) } + let_it_be(:project_1) { create(:project, namespace: namespace) } + let_it_be(:project_2) { create(:project, namespace: namespace) } + let_it_be(:project_3) { create(:project) } + + let(:list) { described_class.new(namespace) } + + describe '#new' do + context 'when namespace is not a root namespace' do + let(:namespace) { create(:group, :nested) } + + it 'raises an exception' do + expect { list }.to raise_error(ArgumentError, 'Namespace is not a root namespace') + end + end + end + + describe '#resources' do + subject(:resources) { list.resources } + + context 'when the namespace has no catalog resources' do + it { is_expected.to be_empty } + end + + context 'when the namespace has catalog resources' do + let!(:resource) { create(:catalog_resource, project: project_1) } + + it 'contains only catalog resources for projects in that namespace' do + is_expected.to contain_exactly(resource) + end + end + end +end diff --git a/spec/models/concerns/ci/partitionable_spec.rb b/spec/models/concerns/ci/partitionable_spec.rb index f3d33c971c7..5100f20ed25 100644 --- a/spec/models/concerns/ci/partitionable_spec.rb +++ b/spec/models/concerns/ci/partitionable_spec.rb @@ -40,4 +40,28 @@ RSpec.describe Ci::Partitionable do it { expect(ci_model.ancestors).to include(described_class::Switch) } end + + context 'with partitioned options' do + before do + stub_const("#{described_class}::Testing::PARTITIONABLE_MODELS", [ci_model.name]) + + ci_model.include(described_class) + ci_model.partitionable scope: ->(r) { 1 }, partitioned: partitioned + end + + context 'when partitioned is true' do + let(:partitioned) { true } + + it { expect(ci_model.ancestors).to include(PartitionedTable) } + it { expect(ci_model.partitioning_strategy).to be_a(Gitlab::Database::Partitioning::CiSlidingListStrategy) } + it { expect(ci_model.partitioning_strategy.partitioning_key).to eq(:partition_id) } + end + + context 'when partitioned is false' do + let(:partitioned) { false } + + it { expect(ci_model.ancestors).not_to include(PartitionedTable) } + it { expect(ci_model).not_to respond_to(:partitioning_strategy) } + end + end end diff --git a/spec/models/integrations/mattermost_slash_commands_spec.rb b/spec/models/integrations/mattermost_slash_commands_spec.rb index 6effc035161..e393a905f45 100644 --- a/spec/models/integrations/mattermost_slash_commands_spec.rb +++ b/spec/models/integrations/mattermost_slash_commands_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Integrations::MattermostSlashCommands do +RSpec.describe Integrations::MattermostSlashCommands, feature_category: :integrations do it_behaves_like Integrations::BaseSlashCommands describe 'Mattermost API' do diff --git a/spec/models/integrations/slack_slash_commands_spec.rb b/spec/models/integrations/slack_slash_commands_spec.rb index 7336424623d..f373fc2a2de 100644 --- a/spec/models/integrations/slack_slash_commands_spec.rb +++ b/spec/models/integrations/slack_slash_commands_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Integrations::SlackSlashCommands do +RSpec.describe Integrations::SlackSlashCommands, feature_category: :integrations do it_behaves_like Integrations::BaseSlashCommands describe '#trigger' do diff --git a/spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb b/spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb index 6b8584b37b7..46ea0036e49 100644 --- a/spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb +++ b/spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService::StatusCollection it 'does update existing status of processable' do collection.set_processable_status(test_a.id, 'success', 100) - expect(collection.status_for_names(['test-a'], dag: false)).to eq('success') + expect(collection.status_of_processables(['test-a'], dag: false)).to eq('success') end it 'ignores a missing processable' do @@ -50,7 +50,7 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService::StatusCollection end end - describe '#status_for_names' do + describe '#status_of_processables' do where(:names, :status, :dag) do %w[build-a] | 'success' | false %w[build-a build-b] | 'failed' | false @@ -62,12 +62,12 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService::StatusCollection with_them do it 'returns composite status of given names' do - expect(collection.status_for_names(names, dag: dag)).to eq(status) + expect(collection.status_of_processables(names, dag: dag)).to eq(status) end end end - describe '#status_for_prior_stage_position' do + describe '#status_of_processables_prior_to_stage' do where(:stage, :status) do 0 | 'success' 1 | 'failed' @@ -76,12 +76,12 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService::StatusCollection with_them do it 'returns composite status for processables in prior stages' do - expect(collection.status_for_prior_stage_position(stage)).to eq(status) + expect(collection.status_of_processables_prior_to_stage(stage)).to eq(status) end end end - describe '#status_for_stage_position' do + describe '#status_of_stage' do where(:stage, :status) do 0 | 'failed' 1 | 'running' @@ -90,16 +90,16 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService::StatusCollection with_them do it 'returns composite status for processables at a given stages' do - expect(collection.status_for_stage_position(stage)).to eq(status) + expect(collection.status_of_stage(stage)).to eq(status) end end end - describe '#created_processable_ids_for_stage_position' do + describe '#created_processable_ids_in_stage' do it 'returns IDs of processables at a given stage position' do - expect(collection.created_processable_ids_for_stage_position(0)).to be_empty - expect(collection.created_processable_ids_for_stage_position(1)).to be_empty - expect(collection.created_processable_ids_for_stage_position(2)).to contain_exactly(deploy.id) + expect(collection.created_processable_ids_in_stage(0)).to be_empty + expect(collection.created_processable_ids_in_stage(1)).to be_empty + expect(collection.created_processable_ids_in_stage(2)).to contain_exactly(deploy.id) end end diff --git a/spec/services/container_expiration_policies/cleanup_service_spec.rb b/spec/services/container_expiration_policies/cleanup_service_spec.rb index 6e1be7271e1..9d9ffebe59f 100644 --- a/spec/services/container_expiration_policies/cleanup_service_spec.rb +++ b/spec/services/container_expiration_policies/cleanup_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ContainerExpirationPolicies::CleanupService do +RSpec.describe ContainerExpirationPolicies::CleanupService, feature_category: :container_registry do let_it_be(:repository, reload: true) { create(:container_repository, expiration_policy_started_at: 30.minutes.ago) } let_it_be(:project) { repository.project } diff --git a/spec/services/container_expiration_policies/update_service_spec.rb b/spec/services/container_expiration_policies/update_service_spec.rb index 7d949b77de7..992240201e0 100644 --- a/spec/services/container_expiration_policies/update_service_spec.rb +++ b/spec/services/container_expiration_policies/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ContainerExpirationPolicies::UpdateService do +RSpec.describe ContainerExpirationPolicies::UpdateService, feature_category: :container_registry do using RSpec::Parameterized::TableSyntax let_it_be(:project, reload: true) { create(:project) } diff --git a/spec/services/customer_relations/contacts/create_service_spec.rb b/spec/services/customer_relations/contacts/create_service_spec.rb index db6cce799fe..610143586e3 100644 --- a/spec/services/customer_relations/contacts/create_service_spec.rb +++ b/spec/services/customer_relations/contacts/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CustomerRelations::Contacts::CreateService do +RSpec.describe CustomerRelations::Contacts::CreateService, feature_category: :service_desk do describe '#execute' do let_it_be(:user) { create(:user) } let_it_be(:not_found_or_does_not_belong) { 'The specified organization was not found or does not belong to this group' } diff --git a/spec/services/customer_relations/contacts/update_service_spec.rb b/spec/services/customer_relations/contacts/update_service_spec.rb index 729fdc2058b..105b5bad5f7 100644 --- a/spec/services/customer_relations/contacts/update_service_spec.rb +++ b/spec/services/customer_relations/contacts/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CustomerRelations::Contacts::UpdateService do +RSpec.describe CustomerRelations::Contacts::UpdateService, feature_category: :service_desk do let_it_be(:user) { create(:user) } let(:contact) { create(:contact, first_name: 'Mark', group: group, state: 'active') } diff --git a/spec/services/customer_relations/organizations/create_service_spec.rb b/spec/services/customer_relations/organizations/create_service_spec.rb index 18eefdd716e..3b1ae5606b1 100644 --- a/spec/services/customer_relations/organizations/create_service_spec.rb +++ b/spec/services/customer_relations/organizations/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CustomerRelations::Organizations::CreateService do +RSpec.describe CustomerRelations::Organizations::CreateService, feature_category: :service_desk do describe '#execute' do let_it_be(:user) { create(:user) } diff --git a/spec/services/customer_relations/organizations/update_service_spec.rb b/spec/services/customer_relations/organizations/update_service_spec.rb index 4764ba85551..ac71a211bf8 100644 --- a/spec/services/customer_relations/organizations/update_service_spec.rb +++ b/spec/services/customer_relations/organizations/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CustomerRelations::Organizations::UpdateService do +RSpec.describe CustomerRelations::Organizations::UpdateService, feature_category: :service_desk do let_it_be(:user) { create(:user) } let(:organization) { create(:organization, name: 'Test', group: group, state: 'active') } diff --git a/spec/services/database/consistency_fix_service_spec.rb b/spec/services/database/consistency_fix_service_spec.rb index 9a0fac2191c..fcc776cbc2a 100644 --- a/spec/services/database/consistency_fix_service_spec.rb +++ b/spec/services/database/consistency_fix_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Database::ConsistencyFixService do +RSpec.describe Database::ConsistencyFixService, feature_category: :pods do describe '#execute' do context 'fixing namespaces inconsistencies' do subject(:consistency_fix_service) do diff --git a/spec/services/dependency_proxy/auth_token_service_spec.rb b/spec/services/dependency_proxy/auth_token_service_spec.rb index c686f57c5cb..2612c5765a4 100644 --- a/spec/services/dependency_proxy/auth_token_service_spec.rb +++ b/spec/services/dependency_proxy/auth_token_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DependencyProxy::AuthTokenService do +RSpec.describe DependencyProxy::AuthTokenService, feature_category: :dependency_proxy do include DependencyProxyHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/dependency_proxy/find_cached_manifest_service_spec.rb b/spec/services/dependency_proxy/find_cached_manifest_service_spec.rb index 470c6eb9e03..13620b3dfc1 100644 --- a/spec/services/dependency_proxy/find_cached_manifest_service_spec.rb +++ b/spec/services/dependency_proxy/find_cached_manifest_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DependencyProxy::FindCachedManifestService do +RSpec.describe DependencyProxy::FindCachedManifestService, feature_category: :dependency_proxy do include DependencyProxyHelpers let_it_be(:image) { 'alpine' } diff --git a/spec/services/dependency_proxy/group_settings/update_service_spec.rb b/spec/services/dependency_proxy/group_settings/update_service_spec.rb index 4954d9ec267..38f837a828a 100644 --- a/spec/services/dependency_proxy/group_settings/update_service_spec.rb +++ b/spec/services/dependency_proxy/group_settings/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ::DependencyProxy::GroupSettings::UpdateService do +RSpec.describe ::DependencyProxy::GroupSettings::UpdateService, feature_category: :dependency_proxy do using RSpec::Parameterized::TableSyntax let_it_be_with_reload(:group) { create(:group) } diff --git a/spec/services/dependency_proxy/head_manifest_service_spec.rb b/spec/services/dependency_proxy/head_manifest_service_spec.rb index 949a8eb3bee..a9646a185bc 100644 --- a/spec/services/dependency_proxy/head_manifest_service_spec.rb +++ b/spec/services/dependency_proxy/head_manifest_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DependencyProxy::HeadManifestService do +RSpec.describe DependencyProxy::HeadManifestService, feature_category: :dependency_proxy do include DependencyProxyHelpers let(:image) { 'alpine' } diff --git a/spec/services/dependency_proxy/image_ttl_group_policies/update_service_spec.rb b/spec/services/dependency_proxy/image_ttl_group_policies/update_service_spec.rb index 3a6ba2cca71..f58434222a5 100644 --- a/spec/services/dependency_proxy/image_ttl_group_policies/update_service_spec.rb +++ b/spec/services/dependency_proxy/image_ttl_group_policies/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ::DependencyProxy::ImageTtlGroupPolicies::UpdateService do +RSpec.describe ::DependencyProxy::ImageTtlGroupPolicies::UpdateService, feature_category: :dependency_proxy do using RSpec::Parameterized::TableSyntax let_it_be_with_reload(:group) { create(:group) } diff --git a/spec/services/dependency_proxy/request_token_service_spec.rb b/spec/services/dependency_proxy/request_token_service_spec.rb index 8b3ba783b8d..0cc3695f0b0 100644 --- a/spec/services/dependency_proxy/request_token_service_spec.rb +++ b/spec/services/dependency_proxy/request_token_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DependencyProxy::RequestTokenService do +RSpec.describe DependencyProxy::RequestTokenService, feature_category: :dependency_proxy do include DependencyProxyHelpers let(:image) { 'alpine:3.9' } diff --git a/spec/services/deploy_keys/create_service_spec.rb b/spec/services/deploy_keys/create_service_spec.rb index 2e3318236f5..8bff80b2d11 100644 --- a/spec/services/deploy_keys/create_service_spec.rb +++ b/spec/services/deploy_keys/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe DeployKeys::CreateService do +RSpec.describe DeployKeys::CreateService, feature_category: :continuous_delivery do let(:user) { create(:user) } let(:params) { attributes_for(:deploy_key) } diff --git a/spec/services/deployments/archive_in_project_service_spec.rb b/spec/services/deployments/archive_in_project_service_spec.rb index a316c210d64..ed03ce06255 100644 --- a/spec/services/deployments/archive_in_project_service_spec.rb +++ b/spec/services/deployments/archive_in_project_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::ArchiveInProjectService do +RSpec.describe Deployments::ArchiveInProjectService, feature_category: :continuous_delivery do let_it_be(:project) { create(:project, :repository) } let(:service) { described_class.new(project, nil) } diff --git a/spec/services/deployments/create_for_build_service_spec.rb b/spec/services/deployments/create_for_build_service_spec.rb index 3748df87d99..c07fc07cfbf 100644 --- a/spec/services/deployments/create_for_build_service_spec.rb +++ b/spec/services/deployments/create_for_build_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::CreateForBuildService do +RSpec.describe Deployments::CreateForBuildService, feature_category: :continuous_delivery do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } diff --git a/spec/services/deployments/create_service_spec.rb b/spec/services/deployments/create_service_spec.rb index 0f2a6ce32e1..2a70d450575 100644 --- a/spec/services/deployments/create_service_spec.rb +++ b/spec/services/deployments/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::CreateService do +RSpec.describe Deployments::CreateService, feature_category: :continuous_delivery do let(:user) { create(:user) } describe '#execute' do diff --git a/spec/services/deployments/link_merge_requests_service_spec.rb b/spec/services/deployments/link_merge_requests_service_spec.rb index a653cd2b48b..a468af90ffb 100644 --- a/spec/services/deployments/link_merge_requests_service_spec.rb +++ b/spec/services/deployments/link_merge_requests_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::LinkMergeRequestsService do +RSpec.describe Deployments::LinkMergeRequestsService, feature_category: :continuous_delivery do let(:project) { create(:project, :repository) } # * ddd0f15 Merge branch 'po-fix-test-env-path' into 'master' diff --git a/spec/services/deployments/older_deployments_drop_service_spec.rb b/spec/services/deployments/older_deployments_drop_service_spec.rb index d9a512a5dd2..7e3074a1688 100644 --- a/spec/services/deployments/older_deployments_drop_service_spec.rb +++ b/spec/services/deployments/older_deployments_drop_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::OlderDeploymentsDropService do +RSpec.describe Deployments::OlderDeploymentsDropService, feature_category: :continuous_delivery do let(:environment) { create(:environment) } let(:deployment) { create(:deployment, environment: environment) } let(:service) { described_class.new(deployment) } diff --git a/spec/services/deployments/update_environment_service_spec.rb b/spec/services/deployments/update_environment_service_spec.rb index 31a3abda8c7..33c9c9ed592 100644 --- a/spec/services/deployments/update_environment_service_spec.rb +++ b/spec/services/deployments/update_environment_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::UpdateEnvironmentService do +RSpec.describe Deployments::UpdateEnvironmentService, feature_category: :continuous_delivery do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:options) { { name: environment_name } } diff --git a/spec/services/deployments/update_service_spec.rb b/spec/services/deployments/update_service_spec.rb index d3840189ba4..0814091765c 100644 --- a/spec/services/deployments/update_service_spec.rb +++ b/spec/services/deployments/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Deployments::UpdateService do +RSpec.describe Deployments::UpdateService, feature_category: :continuous_delivery do let(:deploy) { create(:deployment) } describe '#execute' do diff --git a/spec/services/design_management/copy_design_collection/queue_service_spec.rb b/spec/services/design_management/copy_design_collection/queue_service_spec.rb index 05a7b092ccf..e6809e65d8a 100644 --- a/spec/services/design_management/copy_design_collection/queue_service_spec.rb +++ b/spec/services/design_management/copy_design_collection/queue_service_spec.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DesignManagement::CopyDesignCollection::QueueService, :clean_gitlab_redis_shared_state do +RSpec.describe DesignManagement::CopyDesignCollection::QueueService, :clean_gitlab_redis_shared_state, + feature_category: :design_management do include DesignManagementTestHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/design_management/delete_designs_service_spec.rb b/spec/services/design_management/delete_designs_service_spec.rb index 48e53a92758..09ff2c5b897 100644 --- a/spec/services/design_management/delete_designs_service_spec.rb +++ b/spec/services/design_management/delete_designs_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DesignManagement::DeleteDesignsService do +RSpec.describe DesignManagement::DeleteDesignsService, feature_category: :design_management do include DesignManagementTestHelpers let_it_be(:project) { create(:project) } diff --git a/spec/services/design_management/design_user_notes_count_service_spec.rb b/spec/services/design_management/design_user_notes_count_service_spec.rb index 37806d3461c..1dbd055038c 100644 --- a/spec/services/design_management/design_user_notes_count_service_spec.rb +++ b/spec/services/design_management/design_user_notes_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe DesignManagement::DesignUserNotesCountService, :use_clean_rails_memory_store_caching do +RSpec.describe DesignManagement::DesignUserNotesCountService, :use_clean_rails_memory_store_caching, feature_category: :design_management do let_it_be(:design) { create(:design, :with_file) } subject { described_class.new(design) } diff --git a/spec/services/design_management/generate_image_versions_service_spec.rb b/spec/services/design_management/generate_image_versions_service_spec.rb index 5409ec12016..08442f221fa 100644 --- a/spec/services/design_management/generate_image_versions_service_spec.rb +++ b/spec/services/design_management/generate_image_versions_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe DesignManagement::GenerateImageVersionsService do +RSpec.describe DesignManagement::GenerateImageVersionsService, feature_category: :design_management do let_it_be(:project) { create(:project) } let_it_be(:issue) { create(:issue, project: project) } let_it_be(:version) { create(:design, :with_lfs_file, issue: issue).versions.first } diff --git a/spec/services/design_management/move_designs_service_spec.rb b/spec/services/design_management/move_designs_service_spec.rb index 519378a8dd4..8276d8d186a 100644 --- a/spec/services/design_management/move_designs_service_spec.rb +++ b/spec/services/design_management/move_designs_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DesignManagement::MoveDesignsService do +RSpec.describe DesignManagement::MoveDesignsService, feature_category: :design_management do include DesignManagementTestHelpers let_it_be(:issue) { create(:issue) } diff --git a/spec/services/discussions/capture_diff_note_position_service_spec.rb b/spec/services/discussions/capture_diff_note_position_service_spec.rb index 11614ccfd55..313e828bf0a 100644 --- a/spec/services/discussions/capture_diff_note_position_service_spec.rb +++ b/spec/services/discussions/capture_diff_note_position_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Discussions::CaptureDiffNotePositionService do +RSpec.describe Discussions::CaptureDiffNotePositionService, feature_category: :code_review_workflow do subject { described_class.new(note.noteable, paths) } context 'image note on diff' do diff --git a/spec/services/discussions/capture_diff_note_positions_service_spec.rb b/spec/services/discussions/capture_diff_note_positions_service_spec.rb index 8ba54495d4c..96922535eb2 100644 --- a/spec/services/discussions/capture_diff_note_positions_service_spec.rb +++ b/spec/services/discussions/capture_diff_note_positions_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Discussions::CaptureDiffNotePositionsService do +RSpec.describe Discussions::CaptureDiffNotePositionsService, feature_category: :code_review_workflow do context 'when merge request has a discussion' do let(:source_branch) { 'compare-with-merge-head-source' } let(:target_branch) { 'compare-with-merge-head-target' } diff --git a/spec/services/discussions/update_diff_position_service_spec.rb b/spec/services/discussions/update_diff_position_service_spec.rb index e7a3505bbd4..274430fdccb 100644 --- a/spec/services/discussions/update_diff_position_service_spec.rb +++ b/spec/services/discussions/update_diff_position_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Discussions::UpdateDiffPositionService do +RSpec.describe Discussions::UpdateDiffPositionService, feature_category: :code_review_workflow do let(:project) { create(:project, :repository) } let(:current_user) { project.first_owner } let(:create_commit) { project.commit("913c66a37b4a45b9769037c55c2d238bd0942d2e") } diff --git a/spec/services/draft_notes/create_service_spec.rb b/spec/services/draft_notes/create_service_spec.rb index 528c8717525..93731a80dcc 100644 --- a/spec/services/draft_notes/create_service_spec.rb +++ b/spec/services/draft_notes/create_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DraftNotes::CreateService do +RSpec.describe DraftNotes::CreateService, feature_category: :code_review_workflow do let(:merge_request) { create(:merge_request) } let(:project) { merge_request.target_project } let(:user) { merge_request.author } diff --git a/spec/services/draft_notes/destroy_service_spec.rb b/spec/services/draft_notes/destroy_service_spec.rb index 1f246a56eb3..f4cc9daa9e9 100644 --- a/spec/services/draft_notes/destroy_service_spec.rb +++ b/spec/services/draft_notes/destroy_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DraftNotes::DestroyService do +RSpec.describe DraftNotes::DestroyService, feature_category: :code_review_workflow do let(:merge_request) { create(:merge_request) } let(:project) { merge_request.target_project } let(:user) { merge_request.author } diff --git a/spec/services/draft_notes/publish_service_spec.rb b/spec/services/draft_notes/publish_service_spec.rb index 44fe9063ac9..a4b1d8742d0 100644 --- a/spec/services/draft_notes/publish_service_spec.rb +++ b/spec/services/draft_notes/publish_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe DraftNotes::PublishService do +RSpec.describe DraftNotes::PublishService, feature_category: :code_review_workflow do include RepoHelpers let(:merge_request) { create(:merge_request) } diff --git a/spec/services/emails/confirm_service_spec.rb b/spec/services/emails/confirm_service_spec.rb index e8d3c0d673b..43fca75a5ea 100644 --- a/spec/services/emails/confirm_service_spec.rb +++ b/spec/services/emails/confirm_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Emails::ConfirmService do +RSpec.describe Emails::ConfirmService, feature_category: :user_management do let_it_be(:user) { create(:user) } subject(:service) { described_class.new(user) } diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb index b13197f21b8..3ef67036483 100644 --- a/spec/services/emails/create_service_spec.rb +++ b/spec/services/emails/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Emails::CreateService do +RSpec.describe Emails::CreateService, feature_category: :user_management do let_it_be(:user) { create(:user) } let(:opts) { { email: 'new@email.com', user: user } } diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb index 7dcf367016e..9d5e2b45647 100644 --- a/spec/services/emails/destroy_service_spec.rb +++ b/spec/services/emails/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Emails::DestroyService do +RSpec.describe Emails::DestroyService, feature_category: :user_management do let!(:user) { create(:user) } let!(:email) { create(:email, user: user) } diff --git a/spec/services/environments/auto_stop_service_spec.rb b/spec/services/environments/auto_stop_service_spec.rb index d688690c376..57fb860a557 100644 --- a/spec/services/environments/auto_stop_service_spec.rb +++ b/spec/services/environments/auto_stop_service_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe Environments::AutoStopService, :clean_gitlab_redis_shared_state, :sidekiq_inline do +RSpec.describe Environments::AutoStopService, :clean_gitlab_redis_shared_state, :sidekiq_inline, + feature_category: :continuous_delivery do include CreateEnvironmentsHelpers include ExclusiveLeaseHelpers diff --git a/spec/services/environments/canary_ingress/update_service_spec.rb b/spec/services/environments/canary_ingress/update_service_spec.rb index 531f7d68a9f..f7d446c13f9 100644 --- a/spec/services/environments/canary_ingress/update_service_spec.rb +++ b/spec/services/environments/canary_ingress/update_service_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe Environments::CanaryIngress::UpdateService, :clean_gitlab_redis_cache do +RSpec.describe Environments::CanaryIngress::UpdateService, :clean_gitlab_redis_cache, + feature_category: :continuous_delivery do include KubernetesHelpers let_it_be(:project, refind: true) { create(:project) } diff --git a/spec/services/environments/create_for_build_service_spec.rb b/spec/services/environments/create_for_build_service_spec.rb index c7aadb20c01..223401a243d 100644 --- a/spec/services/environments/create_for_build_service_spec.rb +++ b/spec/services/environments/create_for_build_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Environments::CreateForBuildService do +RSpec.describe Environments::CreateForBuildService, feature_category: :continuous_delivery do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } let_it_be(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/services/environments/reset_auto_stop_service_spec.rb b/spec/services/environments/reset_auto_stop_service_spec.rb index 4a0b091c12d..a3b8b2e0aa1 100644 --- a/spec/services/environments/reset_auto_stop_service_spec.rb +++ b/spec/services/environments/reset_auto_stop_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Environments::ResetAutoStopService do +RSpec.describe Environments::ResetAutoStopService, feature_category: :continuous_delivery do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user).tap { |user| project.add_developer(user) } } let_it_be(:reporter) { create(:user).tap { |user| project.add_reporter(user) } } diff --git a/spec/services/environments/schedule_to_delete_review_apps_service_spec.rb b/spec/services/environments/schedule_to_delete_review_apps_service_spec.rb index 401d6203b2c..3047f415815 100644 --- a/spec/services/environments/schedule_to_delete_review_apps_service_spec.rb +++ b/spec/services/environments/schedule_to_delete_review_apps_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Environments::ScheduleToDeleteReviewAppsService do +RSpec.describe Environments::ScheduleToDeleteReviewAppsService, feature_category: :continuous_delivery do include ExclusiveLeaseHelpers let_it_be(:maintainer) { create(:user) } diff --git a/spec/services/environments/stop_service_spec.rb b/spec/services/environments/stop_service_spec.rb index 5f983a2151a..6e3b36b5636 100644 --- a/spec/services/environments/stop_service_spec.rb +++ b/spec/services/environments/stop_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Environments::StopService do +RSpec.describe Environments::StopService, feature_category: :continuous_delivery do include CreateEnvironmentsHelpers let(:project) { create(:project, :private, :repository) } diff --git a/spec/services/error_tracking/base_service_spec.rb b/spec/services/error_tracking/base_service_spec.rb index de3523cb847..ed9efd9f95a 100644 --- a/spec/services/error_tracking/base_service_spec.rb +++ b/spec/services/error_tracking/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ErrorTracking::BaseService do +RSpec.describe ErrorTracking::BaseService, feature_category: :error_tracking do describe '#compose_response' do let(:project) { build_stubbed(:project) } let(:user) { build_stubbed(:user, id: non_existing_record_id) } diff --git a/spec/services/error_tracking/collect_error_service_spec.rb b/spec/services/error_tracking/collect_error_service_spec.rb index 159c070c683..3ff753e8c65 100644 --- a/spec/services/error_tracking/collect_error_service_spec.rb +++ b/spec/services/error_tracking/collect_error_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ErrorTracking::CollectErrorService do +RSpec.describe ErrorTracking::CollectErrorService, feature_category: :error_tracking do let_it_be(:project) { create(:project) } let(:parsed_event_file) { 'error_tracking/parsed_event.json' } diff --git a/spec/services/error_tracking/issue_details_service_spec.rb b/spec/services/error_tracking/issue_details_service_spec.rb index 29f8154a27c..7ac41ffead6 100644 --- a/spec/services/error_tracking/issue_details_service_spec.rb +++ b/spec/services/error_tracking/issue_details_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ErrorTracking::IssueDetailsService do +RSpec.describe ErrorTracking::IssueDetailsService, feature_category: :error_tracking do include_context 'sentry error tracking context' subject { described_class.new(project, user, params) } diff --git a/spec/services/error_tracking/issue_latest_event_service_spec.rb b/spec/services/error_tracking/issue_latest_event_service_spec.rb index aa2430ddffb..bfde14c7ef1 100644 --- a/spec/services/error_tracking/issue_latest_event_service_spec.rb +++ b/spec/services/error_tracking/issue_latest_event_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ErrorTracking::IssueLatestEventService do +RSpec.describe ErrorTracking::IssueLatestEventService, feature_category: :error_tracking do include_context 'sentry error tracking context' let(:params) { {} } diff --git a/spec/services/error_tracking/issue_update_service_spec.rb b/spec/services/error_tracking/issue_update_service_spec.rb index a06c3588264..4dae6cc2fa0 100644 --- a/spec/services/error_tracking/issue_update_service_spec.rb +++ b/spec/services/error_tracking/issue_update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ErrorTracking::IssueUpdateService do +RSpec.describe ErrorTracking::IssueUpdateService, feature_category: :error_tracking do include_context 'sentry error tracking context' let(:arguments) { { issue_id: non_existing_record_id, status: 'resolved' } } diff --git a/spec/services/error_tracking/list_issues_service_spec.rb b/spec/services/error_tracking/list_issues_service_spec.rb index a7bd6c75df5..2c35c2b8acd 100644 --- a/spec/services/error_tracking/list_issues_service_spec.rb +++ b/spec/services/error_tracking/list_issues_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ErrorTracking::ListIssuesService do +RSpec.describe ErrorTracking::ListIssuesService, feature_category: :error_tracking do include_context 'sentry error tracking context' let(:params) { {} } diff --git a/spec/services/events/destroy_service_spec.rb b/spec/services/events/destroy_service_spec.rb index 8b07852c040..e50fe247238 100644 --- a/spec/services/events/destroy_service_spec.rb +++ b/spec/services/events/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Events::DestroyService do +RSpec.describe Events::DestroyService, feature_category: :user_profile do subject(:service) { described_class.new(project) } let_it_be(:project, reload: true) { create(:project, :repository) } diff --git a/spec/services/events/render_service_spec.rb b/spec/services/events/render_service_spec.rb index 24a3b9abe14..2e8cd26781b 100644 --- a/spec/services/events/render_service_spec.rb +++ b/spec/services/events/render_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Events::RenderService do +RSpec.describe Events::RenderService, feature_category: :user_profile do describe '#execute' do let!(:note) { build(:note) } let!(:event) { build(:event, target: note, project: note.project) } diff --git a/spec/services/feature_flags/create_service_spec.rb b/spec/services/feature_flags/create_service_spec.rb index 1a32faad948..3ad5287059f 100644 --- a/spec/services/feature_flags/create_service_spec.rb +++ b/spec/services/feature_flags/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe FeatureFlags::CreateService do +RSpec.describe FeatureFlags::CreateService, feature_category: :feature_flags do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user) } let_it_be(:reporter) { create(:user) } diff --git a/spec/services/feature_flags/destroy_service_spec.rb b/spec/services/feature_flags/destroy_service_spec.rb index b2793dc0560..7dbd8d53f2c 100644 --- a/spec/services/feature_flags/destroy_service_spec.rb +++ b/spec/services/feature_flags/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe FeatureFlags::DestroyService do +RSpec.describe FeatureFlags::DestroyService, feature_category: :feature_flags do include FeatureFlagHelpers let_it_be(:project) { create(:project) } diff --git a/spec/services/feature_flags/hook_service_spec.rb b/spec/services/feature_flags/hook_service_spec.rb index f3edaca52a9..2a3ce9085b8 100644 --- a/spec/services/feature_flags/hook_service_spec.rb +++ b/spec/services/feature_flags/hook_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe FeatureFlags::HookService do +RSpec.describe FeatureFlags::HookService, feature_category: :feature_flags do describe '#execute_hooks' do let_it_be(:namespace) { create(:namespace) } let_it_be(:project) { create(:project, :repository, namespace: namespace) } diff --git a/spec/services/feature_flags/update_service_spec.rb b/spec/services/feature_flags/update_service_spec.rb index 1c5af71a50a..fe261175374 100644 --- a/spec/services/feature_flags/update_service_spec.rb +++ b/spec/services/feature_flags/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe FeatureFlags::UpdateService, :with_license do +RSpec.describe FeatureFlags::UpdateService, :with_license, feature_category: :feature_flags do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user) } let_it_be(:reporter) { create(:user) } diff --git a/spec/services/files/create_service_spec.rb b/spec/services/files/create_service_spec.rb index 3b3dbd1fcfe..26f57f43120 100644 --- a/spec/services/files/create_service_spec.rb +++ b/spec/services/files/create_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Files::CreateService do +RSpec.describe Files::CreateService, feature_category: :source_code_management do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user, :commit_email) } diff --git a/spec/services/files/delete_service_spec.rb b/spec/services/files/delete_service_spec.rb index 3823d027812..f5e75f45803 100644 --- a/spec/services/files/delete_service_spec.rb +++ b/spec/services/files/delete_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Files::DeleteService do +RSpec.describe Files::DeleteService, feature_category: :source_code_management do subject { described_class.new(project, user, commit_params) } let(:project) { create(:project, :repository) } diff --git a/spec/services/files/multi_service_spec.rb b/spec/services/files/multi_service_spec.rb index 6a5c7d2749d..9b85d83e721 100644 --- a/spec/services/files/multi_service_spec.rb +++ b/spec/services/files/multi_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Files::MultiService do +RSpec.describe Files::MultiService, feature_category: :source_code_management do subject { described_class.new(project, user, commit_params) } let(:project) { create(:project, :repository) } diff --git a/spec/services/files/update_service_spec.rb b/spec/services/files/update_service_spec.rb index 6d7459e0b29..b464e47b0bc 100644 --- a/spec/services/files/update_service_spec.rb +++ b/spec/services/files/update_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Files::UpdateService do +RSpec.describe Files::UpdateService, feature_category: :source_code_management do subject { described_class.new(project, user, commit_params) } let(:project) { create(:project, :repository) } diff --git a/spec/services/git/base_hooks_service_spec.rb b/spec/services/git/base_hooks_service_spec.rb index 5afd7b30ab0..9d49943ccfb 100644 --- a/spec/services/git/base_hooks_service_spec.rb +++ b/spec/services/git/base_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::BaseHooksService do +RSpec.describe Git::BaseHooksService, feature_category: :source_code_management do include RepoHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb index 973ead28462..e991b5bd842 100644 --- a/spec/services/git/branch_hooks_service_spec.rb +++ b/spec/services/git/branch_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::BranchHooksService, :clean_gitlab_redis_shared_state do +RSpec.describe Git::BranchHooksService, :clean_gitlab_redis_shared_state, feature_category: :source_code_management do include RepoHelpers include ProjectForksHelper diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb index a9f5b07fef4..aa534777f3e 100644 --- a/spec/services/git/branch_push_service_spec.rb +++ b/spec/services/git/branch_push_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::BranchPushService, :use_clean_rails_redis_caching, services: true do +RSpec.describe Git::BranchPushService, :use_clean_rails_redis_caching, services: true, feature_category: :source_code_management do include RepoHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/git/process_ref_changes_service_spec.rb b/spec/services/git/process_ref_changes_service_spec.rb index 8d2da4a899e..9ec13bc957b 100644 --- a/spec/services/git/process_ref_changes_service_spec.rb +++ b/spec/services/git/process_ref_changes_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::ProcessRefChangesService do +RSpec.describe Git::ProcessRefChangesService, feature_category: :source_code_management do let(:project) { create(:project, :repository) } let(:user) { project.first_owner } let(:params) { { changes: git_changes } } diff --git a/spec/services/git/tag_hooks_service_spec.rb b/spec/services/git/tag_hooks_service_spec.rb index 01a0d2e8600..73f6eff36ba 100644 --- a/spec/services/git/tag_hooks_service_spec.rb +++ b/spec/services/git/tag_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::TagHooksService, :service do +RSpec.describe Git::TagHooksService, :service, feature_category: :source_code_management do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/services/git/tag_push_service_spec.rb b/spec/services/git/tag_push_service_spec.rb index 597254d46fa..0d40c331d11 100644 --- a/spec/services/git/tag_push_service_spec.rb +++ b/spec/services/git/tag_push_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::TagPushService do +RSpec.describe Git::TagPushService, feature_category: :source_code_management do include RepoHelpers let(:user) { create(:user) } diff --git a/spec/services/git/wiki_push_service/change_spec.rb b/spec/services/git/wiki_push_service/change_spec.rb index 3616bf62b20..ad3c4ae68c0 100644 --- a/spec/services/git/wiki_push_service/change_spec.rb +++ b/spec/services/git/wiki_push_service/change_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::WikiPushService::Change do +RSpec.describe Git::WikiPushService::Change, feature_category: :source_code_management do subject { described_class.new(project_wiki, change, raw_change) } let(:project_wiki) { double('ProjectWiki') } diff --git a/spec/services/google_cloud/create_cloudsql_instance_service_spec.rb b/spec/services/google_cloud/create_cloudsql_instance_service_spec.rb index cd0dd75e576..4f2e0bea623 100644 --- a/spec/services/google_cloud/create_cloudsql_instance_service_spec.rb +++ b/spec/services/google_cloud/create_cloudsql_instance_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::CreateCloudsqlInstanceService do +RSpec.describe GoogleCloud::CreateCloudsqlInstanceService, feature_category: :deployment_management do let(:project) { create(:project) } let(:user) { create(:user) } let(:gcp_project_id) { 'gcp_project_120' } diff --git a/spec/services/google_cloud/create_service_accounts_service_spec.rb b/spec/services/google_cloud/create_service_accounts_service_spec.rb index 3f500e7c235..3b57f2a9e5f 100644 --- a/spec/services/google_cloud/create_service_accounts_service_spec.rb +++ b/spec/services/google_cloud/create_service_accounts_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::CreateServiceAccountsService do +RSpec.describe GoogleCloud::CreateServiceAccountsService, feature_category: :deployment_management do describe '#execute' do before do mock_google_oauth2_creds = Struct.new(:app_id, :app_secret) diff --git a/spec/services/google_cloud/enable_cloud_run_service_spec.rb b/spec/services/google_cloud/enable_cloud_run_service_spec.rb index 6d2b1f5cfd5..3de9e7fcd5c 100644 --- a/spec/services/google_cloud/enable_cloud_run_service_spec.rb +++ b/spec/services/google_cloud/enable_cloud_run_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::EnableCloudRunService do +RSpec.describe GoogleCloud::EnableCloudRunService, feature_category: :deployment_management do describe 'when a project does not have any gcp projects' do let_it_be(:project) { create(:project) } diff --git a/spec/services/google_cloud/enable_cloudsql_service_spec.rb b/spec/services/google_cloud/enable_cloudsql_service_spec.rb index aa6d2402d7c..b14b827e8b8 100644 --- a/spec/services/google_cloud/enable_cloudsql_service_spec.rb +++ b/spec/services/google_cloud/enable_cloudsql_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::EnableCloudsqlService do +RSpec.describe GoogleCloud::EnableCloudsqlService, feature_category: :deployment_management do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:params) do diff --git a/spec/services/google_cloud/gcp_region_add_or_replace_service_spec.rb b/spec/services/google_cloud/gcp_region_add_or_replace_service_spec.rb index b2cd5632be0..a748fed7134 100644 --- a/spec/services/google_cloud/gcp_region_add_or_replace_service_spec.rb +++ b/spec/services/google_cloud/gcp_region_add_or_replace_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::GcpRegionAddOrReplaceService do +RSpec.describe GoogleCloud::GcpRegionAddOrReplaceService, feature_category: :deployment_management do it 'adds and replaces GCP region vars' do project = create(:project, :public) service = described_class.new(project) diff --git a/spec/services/google_cloud/generate_pipeline_service_spec.rb b/spec/services/google_cloud/generate_pipeline_service_spec.rb index a78d8ff6661..c18514884ca 100644 --- a/spec/services/google_cloud/generate_pipeline_service_spec.rb +++ b/spec/services/google_cloud/generate_pipeline_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::GeneratePipelineService do +RSpec.describe GoogleCloud::GeneratePipelineService, feature_category: :deployment_management do describe 'for cloud-run' do describe 'when there is no existing pipeline' do let_it_be(:project) { create(:project, :repository) } diff --git a/spec/services/google_cloud/get_cloudsql_instances_service_spec.rb b/spec/services/google_cloud/get_cloudsql_instances_service_spec.rb index 4587a5077c0..ed41d0fd487 100644 --- a/spec/services/google_cloud/get_cloudsql_instances_service_spec.rb +++ b/spec/services/google_cloud/get_cloudsql_instances_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::GetCloudsqlInstancesService do +RSpec.describe GoogleCloud::GetCloudsqlInstancesService, feature_category: :deployment_management do let(:service) { described_class.new(project) } let(:project) { create(:project) } diff --git a/spec/services/google_cloud/service_accounts_service_spec.rb b/spec/services/google_cloud/service_accounts_service_spec.rb index 10e387126a3..c900bf7d300 100644 --- a/spec/services/google_cloud/service_accounts_service_spec.rb +++ b/spec/services/google_cloud/service_accounts_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::ServiceAccountsService do +RSpec.describe GoogleCloud::ServiceAccountsService, feature_category: :deployment_management do let(:service) { described_class.new(project) } describe 'find_for_project' do diff --git a/spec/services/google_cloud/setup_cloudsql_instance_service_spec.rb b/spec/services/google_cloud/setup_cloudsql_instance_service_spec.rb index 0a0f05ab4be..5095277f61a 100644 --- a/spec/services/google_cloud/setup_cloudsql_instance_service_spec.rb +++ b/spec/services/google_cloud/setup_cloudsql_instance_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GoogleCloud::SetupCloudsqlInstanceService do +RSpec.describe GoogleCloud::SetupCloudsqlInstanceService, feature_category: :deployment_management do let(:random_user) { create(:user) } let(:project) { create(:project) } let(:list_databases_empty) { Google::Apis::SqladminV1beta4::ListDatabasesResponse.new(items: []) } diff --git a/spec/services/gpg_keys/create_service_spec.rb b/spec/services/gpg_keys/create_service_spec.rb index 9ac56355b4b..d603ce951ec 100644 --- a/spec/services/gpg_keys/create_service_spec.rb +++ b/spec/services/gpg_keys/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GpgKeys::CreateService do +RSpec.describe GpgKeys::CreateService, feature_category: :source_code_management do let(:user) { create(:user) } let(:params) { attributes_for(:gpg_key) } diff --git a/spec/services/grafana/proxy_service_spec.rb b/spec/services/grafana/proxy_service_spec.rb index 99120de3593..7029bab379a 100644 --- a/spec/services/grafana/proxy_service_spec.rb +++ b/spec/services/grafana/proxy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Grafana::ProxyService do +RSpec.describe Grafana::ProxyService, feature_category: :metrics do include ReactiveCachingHelpers let_it_be(:project) { create(:project) } diff --git a/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb b/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb index 4c312b42c0a..148ff2cfb54 100644 --- a/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb +++ b/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb @@ -8,7 +8,7 @@ RSpec.shared_examples 'user activates the Mattermost Slash Command integration' it 'shows a token placeholder' do token_placeholder = find_field('service_token')['placeholder'] - expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx') + expect(token_placeholder).to eq('') end it 'redirects to the integrations page after saving but not activating' do diff --git a/spec/views/admin/application_settings/network.html.haml_spec.rb b/spec/views/admin/application_settings/network.html.haml_spec.rb index 3df55be92d5..25d9fb0370c 100644 --- a/spec/views/admin/application_settings/network.html.haml_spec.rb +++ b/spec/views/admin/application_settings/network.html.haml_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'admin/application_settings/network.html.haml', feature_category: let_it_be(:application_setting) { build(:application_setting) } before do + stub_feature_flags(deny_all_requests: false) assign(:application_setting, application_setting) allow(view).to receive(:current_user) { admin } end diff --git a/workhorse/go.mod b/workhorse/go.mod index a4953c87083..c584ce4b310 100644 --- a/workhorse/go.mod +++ b/workhorse/go.mod @@ -21,7 +21,7 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/mitchellh/copystructure v1.2.0 github.com/prometheus/client_golang v1.14.0 - github.com/rafaeljusto/redigomock/v3 v3.1.1 + github.com/rafaeljusto/redigomock/v3 v3.1.2 github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a github.com/sirupsen/logrus v1.9.0 github.com/smartystreets/goconvey v1.7.2 diff --git a/workhorse/go.sum b/workhorse/go.sum index 893a255e525..db8289b93fc 100644 --- a/workhorse/go.sum +++ b/workhorse/go.sum @@ -1671,8 +1671,8 @@ github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/ github.com/prometheus/prometheus v0.40.5 h1:wmk5yNrQlkQ2OvZucMhUB4k78AVfG34szb1UtopS8Vc= github.com/prometheus/prometheus v0.40.5/go.mod h1:bxgdmtoSNLmmIVPGmeTJ3OiP67VmuY4yalE4ZP6L/j8= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rafaeljusto/redigomock/v3 v3.1.1 h1:SdWE9v+SPy3x6G5hS3aofIJgHJY3OdBJ0BdUTk4dYbA= -github.com/rafaeljusto/redigomock/v3 v3.1.1/go.mod h1:F9zPqz8rMriScZkPtUiLJoLruYcpGo/XXREpeyasREM= +github.com/rafaeljusto/redigomock/v3 v3.1.2 h1:B4Y0XJQiPjpwYmkH55aratKX1VfR+JRqzmDKyZbC99o= +github.com/rafaeljusto/redigomock/v3 v3.1.2/go.mod h1:F9zPqz8rMriScZkPtUiLJoLruYcpGo/XXREpeyasREM= github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= |