From e58ce90f147742c314b9cc08c2d1c0b585e39cf9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 11 Jun 2021 18:10:13 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 26 +- .gitlab/ci/rules.gitlab-ci.yml | 8 - .rubocop_manual_todo.yml | 278 ------------------ Gemfile | 1 - Gemfile.lock | 4 - .../components/alert_management_table.vue | 4 +- .../monitoring/components/dashboard.vue | 4 +- .../monitoring/components/dashboard_panel.vue | 5 +- .../nav/components/top_nav_app.vue | 2 + .../nav/components/top_nav_dropdown_menu.vue | 1 + .../components/cells/runner_actions_cell.vue | 4 +- .../runner/components/runner_type_alert.vue | 66 +++++ .../runner/components/runner_type_badge.vue | 19 +- .../runner/components/runner_update_form.vue | 227 ++++++++++++++ app/assets/javascripts/runner/constants.js | 5 + .../runner/graphql/get_runner.query.graphql | 5 +- .../graphql/runner_details.fragment.graphql | 12 + ...graphql => runner_update.mutation.graphql} | 4 +- .../runner_details/runner_details_app.vue | 20 +- .../components/alert_details_table.vue | 13 +- .../components/alerts_deprecation_warning.vue | 7 +- app/controllers/projects/issues_controller.rb | 5 +- .../projects/metrics_dashboard_controller.rb | 1 + app/helpers/nav/top_nav_helper.rb | 2 +- app/models/ci/build.rb | 2 + app/models/ci/build_metadata.rb | 4 +- app/models/ci/pipeline.rb | 4 + app/models/ci/pipeline_schedule.rb | 8 + app/models/concerns/cron_schedulable.rb | 21 +- app/models/merge_request_context_commit.rb | 2 +- app/models/merge_request_diff_commit.rb | 2 +- app/policies/issue_policy.rb | 11 + app/policies/merge_request_policy.rb | 4 + .../file_decompression_service.rb | 2 +- .../bulk_imports/relation_export_service.rb | 4 +- .../calculate_next_run_service.rb | 59 ++++ app/services/issuable_base_service.rb | 9 +- app/services/issues/update_service.rb | 11 - .../ci_configuration/sast_parser_service.rb | 10 +- app/views/admin/runners/show.html.haml | 8 +- app/views/layouts/nav/_dashboard.html.haml | 18 +- .../nav/groups_dropdown/_show.html.haml | 8 +- .../nav/projects_dropdown/_show.html.haml | 4 +- app/views/shared/issuable/_form.html.haml | 8 - .../shared/issuable/form/_metadata.html.haml | 10 +- .../ci_daily_limit_for_pipeline_schedules.yml | 8 + .../development/combined_menu.yml | 2 +- ...idate_import_decompressed_archive_size.yml | 2 +- danger/feature_flag/Dangerfile | 24 -- danger/specialization_labels/Dangerfile | 3 +- ...and_started_at_to_mr_diff_details_table.rb | 10 + ...xes_to_merge_request_diff_details_table.rb | 26 ++ ...ity_report_approval_rules_sidekiq_queue.rb | 15 + ...peline_schedule_triggers_to_plan_limits.rb | 7 + ..._pipeline_schedule_triggers_plan_limits.rb | 26 ++ ...0210611080951_fix_missing_traversal_ids.rb | 48 +++ db/schema_migrations/20210504143128 | 1 + db/schema_migrations/20210505170152 | 1 + db/schema_migrations/20210526155257 | 1 + db/schema_migrations/20210526190259 | 1 + db/schema_migrations/20210526190553 | 1 + db/schema_migrations/20210611080951 | 1 + db/structure.sql | 17 +- doc/ci/variables/README.md | 9 +- doc/development/migration_style_guide.md | 2 +- .../testing_guide/best_practices.md | 30 +- doc/operations/metrics/alerts.md | 18 +- ...import_decompressed_archive_size_limits.md | 4 +- .../upgrading_auto_deploy_dependencies.md | 12 +- .../settings/continuous_integration.md | 63 ++-- doc/user/packages/package_registry/index.md | 7 +- .../workflows/working_with_monorepos.md | 64 ++++ doc/user/permissions.md | 41 ++- .../common/extractors/ndjson_extractor.rb | 2 +- lib/gitlab/ci/cron_parser.rb | 8 + lib/gitlab/import_export/file_importer.rb | 4 +- .../group/legacy_tree_restorer.rb | 4 +- .../import_export/group/tree_restorer.rb | 2 +- lib/gitlab/import_export/group/tree_saver.rb | 4 +- .../import_export/json/legacy_reader.rb | 2 +- .../import_export/json/legacy_writer.rb | 2 +- .../import_export/json/ndjson_reader.rb | 2 +- .../import_export/json/ndjson_writer.rb | 2 +- .../json/streaming_serializer.rb | 2 +- .../legacy_relation_tree_saver.rb | 2 +- .../import_export/project/tree_restorer.rb | 4 +- .../import_export/project/tree_saver.rb | 6 +- lib/gitlab/nav/top_nav_menu_item.rb | 4 +- .../ci_configuration/sast_build_action.rb | 2 - lib/serializers/json.rb | 2 +- locale/gitlab.pot | 9 + qa/qa/page/group/new.rb | 4 + qa/qa/page/main/menu.rb | 70 ++--- .../1_manage/group/bulk_import_group_spec.rb | 7 +- .../snippet/create_personal_snippet_spec.rb | 2 +- ...rsonal_snippet_with_multiple_files_spec.rb | 2 +- .../snippet/snippet_index_page_spec.rb | 2 +- rubocop/code_reuse_helpers.rb | 48 ++- rubocop/cop/gitlab/mark_used_feature_flags.rb | 264 +++++++++++++++++ .../cop/rspec/have_enqueued_sidekiq_job.rb | 60 ---- scripts/used-feature-flags | 22 +- .../admin/runners_controller_spec.rb | 4 + .../application_experiment_spec.rb | 6 - spec/factories/ci/builds.rb | 14 + spec/fast_spec_helper.rb | 5 + spec/features/admin/admin_mode_spec.rb | 10 +- .../issues/user_creates_issue_spec.rb | 48 +-- spec/features/projects/new_project_spec.rb | 4 +- .../components/alert_management_table_spec.js | 32 +- spec/frontend/fixtures/runner.rb | 6 +- .../components/dashboard_panel_spec.js | 26 ++ .../monitoring/components/dashboard_spec.js | 40 +-- .../cells/runner_actions_cell_spec.js | 4 +- .../components/runner_type_alert_spec.js | 61 ++++ .../components/runner_type_badge_spec.js | 10 +- .../components/runner_update_form_spec.js | 263 +++++++++++++++++ .../components/alert_details_table_spec.js | 25 +- spec/helpers/nav/top_nav_helper_spec.rb | 2 +- spec/lib/gitlab/ci/config/entry/job_spec.rb | 4 +- .../gitlab/database/postgres_index_spec.rb | 6 +- .../import_export/group/tree_saver_spec.rb | 2 +- .../json/legacy_reader/file_spec.rb | 2 +- .../json/legacy_reader/hash_spec.rb | 2 +- .../import_export/json/legacy_writer_spec.rb | 2 +- .../import_export/json/ndjson_reader_spec.rb | 2 +- .../import_export/json/ndjson_writer_spec.rb | 2 +- .../json/streaming_serializer_spec.rb | 4 +- .../legacy_relation_tree_saver_spec.rb | 4 +- .../sample/relation_tree_restorer_spec.rb | 2 +- .../project/tree_restorer_spec.rb | 6 +- .../relation_tree_restorer_spec.rb | 8 +- .../sast_build_action_spec.rb | 20 +- spec/lib/serializers/json_spec.rb | 2 +- ...4345_add_admin_mode_protected_path_spec.rb | 2 +- ...91204114127_delete_legacy_triggers_spec.rb | 2 +- ...d_timestamp_softwarelicensespolicy_spec.rb | 2 +- ...22123016_backfill_project_settings_spec.rb | 2 +- ...123155929_remove_invalid_jira_data_spec.rb | 2 +- ..._remove_invalid_issue_tracker_data_spec.rb | 2 +- ...hedule_migrate_issue_trackers_data_spec.rb | 2 +- ...3203550_remove_orphaned_chat_names_spec.rb | 2 +- ...ployment_clusters_from_deployments_spec.rb | 2 +- ...rpolation_format_in_common_metrics_spec.rb | 2 +- .../20200526115436_dedup_mr_metrics_spec.rb | 2 +- ...ule_name_for_code_owners_rule_type_spec.rb | 2 +- ...125016_backfill_namespace_settings_spec.rb | 2 +- ...ique_index_alert_management_alerts_spec.rb | 2 +- ...ue_index_on_cycle_analytics_stages_spec.rb | 2 +- ...dd_o_auth_paths_to_protected_paths_spec.rb | 2 +- ...issing_vulnerabilities_issue_links_spec.rb | 2 +- ...hedule_migration_to_hashed_storage_spec.rb | 2 +- ...or_pre_versioning_terraform_states_spec.rb | 2 +- ..._jira_tracker_deployment_type_jobs_spec.rb | 2 +- ...rate_services_to_http_integrations_spec.rb | 2 +- ...fill_jira_tracker_deployment_type2_spec.rb | 2 +- ...transfered_projects_shared_runners_spec.rb | 2 +- ...duplicate_vulnerabilities_findings_spec.rb | 2 +- ...uid_on_vulnerabilities_occurrences_spec.rb | 2 +- ...2143418_remove_duplicate_services2_spec.rb | 2 +- ...ue_first_mentioned_in_commit_value_spec.rb | 2 +- ...ove_bad_dependency_proxy_manifests_spec.rb | 2 +- ...d_at_after_repository_storage_move_spec.rb | 2 +- ...20210226141517_dedup_issue_metrics_spec.rb | 2 +- ...tuple_count_for_batched_migrations_spec.rb | 2 +- ...ule_artifact_expiry_backfill_again_spec.rb | 2 +- ..._data_deployment_type_based_on_url_spec.rb | 2 +- ...edule_drop_invalid_vulnerabilities_spec.rb | 2 +- ...2_copy_adoption_snapshot_namespace_spec.rb | 2 +- ...4_copy_adoption_segments_namespace_spec.rb | 2 +- ..._value_stream_id_to_project_stages_spec.rb | 2 +- ...dule_drop_invalid_vulnerabilities2_spec.rb | 2 +- ...10601073400_fix_total_stage_in_vsa_spec.rb | 2 +- .../add_default_and_free_plans_spec.rb | 2 +- ...stream_to_groups_with_group_stages_spec.rb | 2 +- ...deploy_token_type_to_deploy_tokens_spec.rb | 2 +- ..._settings_to_all_existing_projects_spec.rb | 2 +- .../migrations/add_new_post_eoa_plans_spec.rb | 2 +- ...to_ci_builds_table_on_user_id_name_spec.rb | 2 +- ...s_weighted_to_application_settings_spec.rb | 2 +- ...al_index_on_project_id_to_services_spec.rb | 2 +- ...ovals_user_id_and_merge_request_id_spec.rb | 2 +- ...leased_at_column_on_releases_table_spec.rb | 2 +- ...ers_integration_prometheus_enabled_spec.rb | 2 +- ...tion_policies_for_oncall_schedules_spec.rb | 2 +- ...fill_imported_snippet_repositories_spec.rb | 2 +- ...ll_operations_feature_flags_active_spec.rb | 2 +- ...kfill_operations_feature_flags_iid_spec.rb | 2 +- ...not_null_constraints_to_timestamps_spec.rb | 2 +- .../backfill_snippet_repositories_spec.rb | 2 +- ...ll_status_page_published_incidents_spec.rb | 2 +- .../backport_enterprise_schema_spec.rb | 2 +- ...signs_filename_length_to_new_limit_spec.rb | 2 +- ...d_local_requests_whitelist_default_spec.rb | 2 +- ...ize_defaults_in_project_statistics_spec.rb | 2 +- .../change_web_hook_events_default_spec.rb | 2 +- spec/migrations/clean_grafana_url_spec.rb | 2 +- ...p_noteable_id_for_notes_on_commits_spec.rb | 2 +- .../clean_up_pending_builds_table_spec.rb | 2 +- ...cleanup_empty_commit_user_mentions_spec.rb | 2 +- ...up_import_states_with_null_user_id_spec.rb | 4 +- .../cleanup_legacy_artifact_migration_spec.rb | 2 +- ...gistry_enabled_to_project_features_spec.rb | 2 +- ...optimistic_locking_nulls_pt2_fixed_spec.rb | 2 +- .../cleanup_optimistic_locking_nulls_spec.rb | 2 +- ...up_projects_with_missing_namespace_spec.rb | 4 +- ...plete_namespace_settings_migration_spec.rb | 2 +- .../confirm_project_bot_users_spec.rb | 2 +- ...onment_for_self_monitoring_project_spec.rb | 2 +- spec/migrations/deduplicate_epic_iids_spec.rb | 2 +- ...rnal_ids_where_feature_flags_usage_spec.rb | 2 +- .../delete_template_project_services_spec.rb | 2 +- ...mplate_services_duplicated_by_type_spec.rb | 2 +- .../delete_user_callout_alerts_moved_spec.rb | 2 +- ...rometheus_services_background_jobs_spec.rb | 2 +- .../drop_alerts_service_data_spec.rb | 2 +- .../drop_background_migration_jobs_spec.rb | 2 +- ...i_cd_settings_merge_trains_enabled_spec.rb | 2 +- ...crypt_feature_flags_clients_tokens_spec.rb | 2 +- ...attributes_on_application_settings_spec.rb | 2 +- ...ueue_reset_merge_status_second_run_spec.rb | 2 +- .../enqueue_reset_merge_status_spec.rb | 2 +- ..._diff_store_on_merge_request_diffs_spec.rb | 2 +- ...filled_file_store_on_package_files_spec.rb | 2 +- ...ensure_namespace_settings_creation_spec.rb | 2 +- ...ensure_target_project_id_is_filled_spec.rb | 2 +- .../ensure_u2f_registrations_migrated_spec.rb | 2 +- .../fill_file_store_ci_job_artifacts_spec.rb | 2 +- .../fill_file_store_lfs_objects_spec.rb | 2 +- ..._productivity_analytics_start_date_spec.rb | 2 +- spec/migrations/fill_store_uploads_spec.rb | 2 +- spec/migrations/fix_max_pages_size_spec.rb | 2 +- spec/migrations/fix_null_type_labels_spec.rb | 2 +- ..._pool_repository_source_project_id_spec.rb | 2 +- ...x_projects_without_project_feature_spec.rb | 2 +- ...ojects_without_prometheus_services_spec.rb | 2 +- .../fix_wrong_pages_access_level_spec.rb | 2 +- .../generate_ci_jwt_signing_key_spec.rb | 2 +- .../generate_lets_encrypt_private_key_spec.rb | 2 +- .../generate_missing_routes_for_bots_spec.rb | 2 +- ...line_schedule_triggers_plan_limits_spec.rb | 73 +++++ .../insert_daily_invites_plan_limits_spec.rb | 2 +- ..._project_feature_flags_plan_limits_spec.rb | 6 +- .../insert_project_hooks_plan_limits_spec.rb | 2 +- ..._merge_request_user_mentions_to_db_spec.rb | 2 +- ...o_dev_ops_domain_to_cluster_domain_spec.rb | 2 +- .../migrate_bot_type_to_user_type_spec.rb | 2 +- ...s_to_protected_branches_in_batches_spec.rb | 2 +- ...igrate_commit_notes_mentions_to_db_spec.rb | 2 +- ..._enum_to_database_framework_record_spec.rb | 2 +- ...mit_signature_worker_sidekiq_queue_spec.rb | 2 +- ...m_namespaces_to_namespace_settings_spec.rb | 2 +- ...te_discussion_id_on_promoted_epics_spec.rb | 2 +- .../migrate_elastic_index_settings_spec.rb | 2 +- ...e_incident_issues_to_incident_type_spec.rb | 2 +- .../migrate_k8s_service_integration_spec.rb | 2 +- ...gacy_managed_clusters_to_unmanaged_spec.rb | 2 +- ...lusters_with_no_token_to_unmanaged_spec.rb | 2 +- ...grate_merge_request_mentions_to_db_spec.rb | 2 +- ...ature_flags_scopes_target_user_ids_spec.rb | 2 +- ...ate_storage_migrator_sidekiq_queue_spec.rb | 2 +- ...ore_security_reports_sidekiq_queue_spec.rb | 2 +- ...eport_approval_rules_sidekiq_queue_spec.rb | 2 +- ...istry_enabled_to_project_features3_spec.rb | 2 +- .../migrations/move_limits_from_plans_spec.rb | 2 +- spec/migrations/nullify_users_role_spec.rb | 2 +- ...e_project_statistics_packages_size_spec.rb | 2 +- ...pe_on_approval_merge_request_rules_spec.rb | 2 +- ...ditional_application_settings_rows_spec.rb | 2 +- ...emove_alerts_service_records_again_spec.rb | 2 +- .../remove_alerts_service_records_spec.rb | 2 +- ...deprecated_jenkins_service_records_spec.rb | 5 +- ...emove_duplicate_labels_from_groups_spec.rb | 2 +- ...move_duplicate_labels_from_project_spec.rb | 2 +- ...ove_empty_github_service_templates_spec.rb | 2 +- ...tlab_issue_tracker_service_records_spec.rb | 2 +- .../remove_hipchat_service_records_spec.rb | 2 +- .../remove_orphan_service_hooks_spec.rb | 2 +- .../remove_orphaned_invited_members_spec.rb | 2 +- ...e_packages_deprecated_dependencies_spec.rb | 2 +- ..._without_group_from_webhooks_table_spec.rb | 2 +- ...ve_security_dashboard_feature_flag_spec.rb | 2 +- ...lag_to_instance_security_dashboard_spec.rb | 2 +- .../rename_sitemap_namespace_spec.rb | 2 +- .../rename_sitemap_root_namespaces_spec.rb | 2 +- ...eschedule_artifact_expiry_backfill_spec.rb | 2 +- .../reseed_merge_trains_enabled_spec.rb | 2 +- ...eseed_repository_storages_weighted_spec.rb | 2 +- ...e_instance_administrators_group_id_spec.rb | 2 +- ...backfill_push_rules_id_in_projects_spec.rb | 2 +- ...ed_by_links_replacement_second_try_spec.rb | 2 +- ...cies_linked_to_no_container_images_spec.rb | 2 +- ...time_for_pages_domain_certificates_spec.rb | 2 +- ...schedule_link_lfs_objects_projects_spec.rb | 2 +- ...edule_migrate_pages_to_zip_storage_spec.rb | 2 +- .../schedule_migrate_security_scans_spec.rb | 2 +- .../schedule_migrate_u2f_webauthn_spec.rb | 2 +- .../schedule_pages_metadata_migration_spec.rb | 2 +- ..._populate_issue_email_participants_spec.rb | 2 +- ...late_merge_request_assignees_table_spec.rb | 2 +- ...pulate_personal_snippet_statistics_spec.rb | 2 +- ...opulate_project_snippet_statistics_spec.rb | 2 +- ..._populate_user_highest_roles_table_spec.rb | 2 +- ..._project_authorizations_second_run_spec.rb | 2 +- ...recalculate_project_authorizations_spec.rb | 2 +- ...e_project_authorizations_third_run_spec.rb | 2 +- .../schedule_sync_issuables_state_id_spec.rb | 2 +- ..._sync_issuables_state_id_where_nil_spec.rb | 2 +- ...o_match_visibility_level_of_parent_spec.rb | 2 +- ...users_that_require_two_factor_auth_spec.rb | 2 +- ...chedule_update_timelogs_project_id_spec.rb | 2 +- ...wo_factor_auth_required_from_group_spec.rb | 2 +- .../seed_merge_trains_enabled_spec.rb | 2 +- .../seed_repository_storages_weighted_spec.rb | 2 +- ...move_temporary_index_on_project_id_spec.rb | 2 +- .../set_issue_id_for_all_versions_spec.rb | 2 +- spec/migrations/set_job_waiter_ttl_spec.rb | 2 +- .../sync_issuables_state_id_spec.rb | 2 +- .../migrations/truncate_user_fullname_spec.rb | 2 +- ...confirm_wrongfully_verified_emails_spec.rb | 2 +- ...ackage_requests_forwarding_default_spec.rb | 2 +- ...ate_fingerprint_sha256_within_keys_spec.rb | 2 +- ...update_historical_data_recorded_at_spec.rb | 2 +- ...l_ids_last_value_for_epics_renamed_spec.rb | 2 +- .../update_minimum_password_length_spec.rb | 2 +- ..._found_group_and_orphaned_projects_spec.rb | 2 +- ...e_timestamp_softwarelicensespolicy_spec.rb | 2 +- spec/models/ci/build_spec.rb | 34 ++- spec/models/ci/pipeline_schedule_spec.rb | 52 +++- spec/models/ci/pipeline_spec.rb | 36 +++ spec/models/plan_limits_spec.rb | 1 + spec/policies/issue_policy_spec.rb | 114 ++++--- spec/rubocop/code_reuse_helpers_spec.rb | 75 ++++- .../gitlab/mark_used_feature_flags_spec.rb | 228 ++++++++++++++ .../rspec/have_enqueued_sidekiq_job_spec.rb | 51 ---- spec/services/issues/create_service_spec.rb | 20 +- .../sast_parser_service_spec.rb | 9 - spec/support/gitlab_experiment.rb | 10 - .../gitlab_stubs/gitlab_ci_for_sast.yml | 1 - .../gitlab_ci_for_sast_default_analyzers.yml | 15 - .../helpers/features/top_nav_spec_helpers.rb | 8 +- spec/support/helpers/stub_experiments.rb | 2 - spec/support/helpers/stubbed_feature.rb | 22 -- spec/support/import_export/common_util.rb | 8 +- .../read_ci_configuration_shared_context.rb | 4 - spec/workers/every_sidekiq_worker_spec.rb | 2 +- 345 files changed, 2499 insertions(+), 1209 deletions(-) create mode 100644 app/assets/javascripts/runner/components/runner_type_alert.vue create mode 100644 app/assets/javascripts/runner/components/runner_update_form.vue create mode 100644 app/assets/javascripts/runner/graphql/runner_details.fragment.graphql rename app/assets/javascripts/runner/graphql/{update_runner.mutation.graphql => runner_update.mutation.graphql} (59%) create mode 100644 app/services/ci/pipeline_schedules/calculate_next_run_service.rb create mode 100644 config/feature_flags/development/ci_daily_limit_for_pipeline_schedules.yml create mode 100644 db/migrate/20210504143128_add_verification_state_and_started_at_to_mr_diff_details_table.rb create mode 100644 db/migrate/20210505170152_add_verification_indexes_to_merge_request_diff_details_table.rb create mode 100644 db/migrate/20210526155257_rename_sync_security_report_approval_rules_sidekiq_queue.rb create mode 100644 db/migrate/20210526190259_add_ci_daily_pipeline_schedule_triggers_to_plan_limits.rb create mode 100644 db/migrate/20210526190553_insert_ci_daily_pipeline_schedule_triggers_plan_limits.rb create mode 100644 db/post_migrate/20210611080951_fix_missing_traversal_ids.rb create mode 100644 db/schema_migrations/20210504143128 create mode 100644 db/schema_migrations/20210505170152 create mode 100644 db/schema_migrations/20210526155257 create mode 100644 db/schema_migrations/20210526190259 create mode 100644 db/schema_migrations/20210526190553 create mode 100644 db/schema_migrations/20210611080951 create mode 100644 doc/user/packages/workflows/working_with_monorepos.md create mode 100644 rubocop/cop/gitlab/mark_used_feature_flags.rb delete mode 100644 rubocop/cop/rspec/have_enqueued_sidekiq_job.rb create mode 100644 spec/frontend/runner/components/runner_type_alert_spec.js create mode 100644 spec/frontend/runner/components/runner_update_form_spec.js create mode 100644 spec/migrations/insert_ci_daily_pipeline_schedule_triggers_plan_limits_spec.rb create mode 100644 spec/rubocop/cop/gitlab/mark_used_feature_flags_spec.rb delete mode 100644 spec/rubocop/cop/rspec/have_enqueued_sidekiq_job_spec.rb delete mode 100644 spec/support/gitlab_stubs/gitlab_ci_for_sast_default_analyzers.yml diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index c4d393eb16c..5f96bdec9e2 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -47,7 +47,6 @@ - rspec_profiling/ - tmp/capybara/ - tmp/memory_test/ - - tmp/feature_flags/ - log/*.log reports: junit: junit_rspec.xml @@ -222,6 +221,11 @@ static-analysis: script: - run_timed_command "retry yarn install --frozen-lockfile" - scripts/static-analysis + artifacts: + expire_in: 31d + when: always + paths: + - tmp/feature_flags/ static-analysis as-if-foss: extends: @@ -460,25 +464,9 @@ rspec:coverage: rspec:feature-flags: extends: - .coverage-base - - .rails:rules:rspec-feature-flags + - .static-analysis:rules:ee-and-foss stage: post-test - # We cannot use needs since it would mean needing 84 jobs (since most are parallelized) - # so we use `dependencies` here. - dependencies: - - setup-test-env - - rspec migration pg12 - - rspec unit pg12 - - rspec integration pg12 - - rspec system pg12 - - rspec-ee migration pg12 - - rspec-ee unit pg12 - - rspec-ee integration pg12 - - rspec-ee system pg12 - - rspec-ee unit pg12 geo - - rspec-ee integration pg12 geo - - rspec-ee system pg12 geo - - memory-static - - memory-on-boot + needs: ["static-analysis"] script: - !reference [.minimal-bundle-install, script] - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8dd97c1fe69..beb46685654 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -932,14 +932,6 @@ - <<: *if-merge-request-title-run-all-rspec when: always -.rails:rules:rspec-feature-flags: - rules: - - <<: *if-not-ee - when: never - - <<: *if-default-branch-schedule-2-hourly - allow_failure: true - - <<: *if-merge-request-title-run-all-rspec - .rails:rules:default-branch-schedule-nightly--code-backstage: rules: - <<: *if-default-branch-schedule-nightly diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index a847fbfe22b..5992affe96a 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -1354,284 +1354,6 @@ RSpec/AnyInstanceOf: - 'spec/workers/wait_for_cluster_creation_worker_spec.rb' - 'ee/spec/workers/security/auto_fix_worker_spec.rb' -# WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/331835 -RSpec/HaveEnqueuedSidekiqJob: - Exclude: - - 'ee/spec/lib/gitlab/geo/log_cursor/events/job_artifact_deleted_event_spec.rb' - - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_deleted_event_spec.rb' - - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_renamed_event_spec.rb' - - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_updated_event_spec.rb' - - 'ee/spec/models/ci/pipeline_spec.rb' - - 'ee/spec/models/concerns/elastic/project_wiki_spec.rb' - - 'ee/spec/models/concerns/elastic/projects_search_spec.rb' - - 'ee/spec/models/ee/alert_management/alert_spec.rb' - - 'ee/spec/models/ee/user_spec.rb' - - 'ee/spec/models/elasticsearch_indexed_namespace_spec.rb' - - 'ee/spec/models/elasticsearch_indexed_project_spec.rb' - - 'ee/spec/models/gitlab/seat_link_data_spec.rb' - - 'ee/spec/models/group_wiki_spec.rb' - - 'ee/spec/models/namespace_statistics_spec.rb' - - 'ee/spec/models/project_feature_spec.rb' - - 'ee/spec/models/project_import_state_spec.rb' - - 'ee/spec/models/project_spec.rb' - - 'ee/spec/requests/api/elasticsearch_indexed_namespaces_spec.rb' - - 'ee/spec/requests/api/graphql/mutations/requirements_management/export_requirements_spec.rb' - - 'ee/spec/requests/api/project_mirror_spec.rb' - - 'ee/spec/requests/api/projects_spec.rb' - - 'ee/spec/services/admin/email_service_spec.rb' - - 'ee/spec/services/application_settings/update_service_spec.rb' - - 'ee/spec/services/auto_merge/merge_train_service_spec.rb' - - 'ee/spec/services/ci_cd/github_setup_service_spec.rb' - - 'ee/spec/services/dast_site_validations/create_service_spec.rb' - - 'ee/spec/services/ee/git/branch_push_service_spec.rb' - - 'ee/spec/services/ee/merge_requests/handle_assignees_change_service_spec.rb' - - 'ee/spec/services/ee/merge_requests/update_service_spec.rb' - - 'ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb' - - 'ee/spec/services/epics/update_dates_service_spec.rb' - - 'ee/spec/services/geo/container_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/design_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/framework_repository_sync_service_spec.rb' - - 'ee/spec/services/geo/hashed_storage_attachments_migration_service_spec.rb' - - 'ee/spec/services/geo/hashed_storage_migration_service_spec.rb' - - 'ee/spec/services/geo/project_housekeeping_service_spec.rb' - - 'ee/spec/services/geo/rename_repository_service_spec.rb' - - 'ee/spec/services/geo/repository_destroy_service_spec.rb' - - 'ee/spec/services/groups/transfer_service_spec.rb' - - 'ee/spec/services/milestones/destroy_service_spec.rb' - - 'ee/spec/services/projects/transfer_service_spec.rb' - - 'ee/spec/services/security/store_report_service_spec.rb' - - 'ee/spec/services/status_page/trigger_publish_service_spec.rb' - - 'ee/spec/services/web_hook_service_spec.rb' - - 'ee/spec/support/shared_examples/models/concerns/verifiable_replicator_shared_examples.rb' - - 'ee/spec/support/shared_examples/quick_actions/issue/status_page_quick_actions_shared_examples.rb' - - 'ee/spec/support/shared_examples/services/base_sync_service_shared_examples.rb' - - 'ee/spec/support/shared_examples/status_page/trigger_publish_shared_examples.rb' - - 'ee/spec/workers/build_finished_worker_spec.rb' - - 'ee/spec/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker_spec.rb' - - 'ee/spec/workers/geo/container_repository_sync_dispatch_worker_spec.rb' - - 'ee/spec/workers/geo/design_repository_shard_sync_worker_spec.rb' - - 'ee/spec/workers/geo/file_download_dispatch_worker_spec.rb' - - 'ee/spec/workers/geo/registry_sync_worker_spec.rb' - - 'ee/spec/workers/geo/repositories_clean_up_worker_spec.rb' - - 'ee/spec/workers/geo/repository_shard_sync_worker_spec.rb' - - 'ee/spec/workers/geo/repository_verification/primary/batch_worker_spec.rb' - - 'ee/spec/workers/geo/repository_verification/primary/shard_worker_spec.rb' - - 'ee/spec/workers/geo/repository_verification/secondary/scheduler_worker_spec.rb' - - 'ee/spec/workers/geo/repository_verification/secondary/shard_worker_spec.rb' - - 'ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb' - - 'ee/spec/workers/incident_management/oncall_rotations/persist_all_rotations_shifts_job_spec.rb' - - 'ee/spec/workers/post_receive_spec.rb' - - 'ee/spec/workers/store_security_reports_worker_spec.rb' - - 'ee/spec/workers/sync_seat_link_worker_spec.rb' - - 'spec/controllers/admin/clusters_controller_spec.rb' - - 'spec/controllers/admin/services_controller_spec.rb' - - 'spec/controllers/chaos_controller_spec.rb' - - 'spec/controllers/groups/clusters_controller_spec.rb' - - 'spec/controllers/groups_controller_spec.rb' - - 'spec/controllers/projects/clusters_controller_spec.rb' - - 'spec/controllers/projects/issues_controller_spec.rb' - - 'spec/controllers/projects/merge_requests_controller_spec.rb' - - 'spec/controllers/projects/pipeline_schedules_controller_spec.rb' - - 'spec/controllers/projects/registry/repositories_controller_spec.rb' - - 'spec/controllers/projects/settings/ci_cd_controller_spec.rb' - - 'spec/controllers/repositories/git_http_controller_spec.rb' - - 'spec/features/admin/admin_uses_repository_checks_spec.rb' - - 'spec/features/clusters/installing_applications_shared_examples.rb' - - 'spec/features/issues/csv_spec.rb' - - 'spec/graphql/mutations/container_repositories/destroy_spec.rb' - - 'spec/graphql/mutations/merge_requests/accept_spec.rb' - - 'spec/lib/gitlab/ci/pipeline/chain/pipeline/process_spec.rb' - - 'spec/lib/gitlab/cleanup/orphan_lfs_file_references_spec.rb' - - 'spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb' - - 'spec/lib/gitlab/github_import/importer/diff_notes_importer_spec.rb' - - 'spec/lib/gitlab/github_import/importer/issues_importer_spec.rb' - - 'spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb' - - 'spec/lib/gitlab/github_import/importer/notes_importer_spec.rb' - - 'spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb' - - 'spec/lib/gitlab/jira_import/issues_importer_spec.rb' - - 'spec/lib/gitlab/pages_transfer_spec.rb' - - 'spec/models/abuse_report_spec.rb' - - 'spec/models/ci/build_spec.rb' - - 'spec/models/ci/build_trace_chunk_spec.rb' - - 'spec/models/ci/job_artifact_spec.rb' - - 'spec/models/ci/pipeline_spec.rb' - - 'spec/models/ci/processable_spec.rb' - - 'spec/models/clusters/integrations/prometheus_spec.rb' - - 'spec/models/commit_status_spec.rb' - - 'spec/models/concerns/reactive_caching_spec.rb' - - 'spec/models/deployment_spec.rb' - - 'spec/models/diff_note_spec.rb' - - 'spec/models/integrations/emails_on_push_spec.rb' - - 'spec/models/issue_spec.rb' - - 'spec/models/jira_import_state_spec.rb' - - 'spec/models/key_spec.rb' - - 'spec/models/lfs_object_spec.rb' - - 'spec/models/lfs_objects_project_spec.rb' - - 'spec/models/merge_request_spec.rb' - - 'spec/models/namespace/aggregation_schedule_spec.rb' - - 'spec/models/namespace_spec.rb' - - 'spec/models/operations/feature_flag_spec.rb' - - 'spec/models/packages/package_spec.rb' - - 'spec/models/pages_domain_spec.rb' - - 'spec/models/pool_repository_spec.rb' - - 'spec/models/project_import_state_spec.rb' - - 'spec/models/project_services/prometheus_service_spec.rb' - - 'spec/models/project_spec.rb' - - 'spec/models/project_statistics_spec.rb' - - 'spec/models/project_wiki_spec.rb' - - 'spec/models/remote_mirror_spec.rb' - - 'spec/models/sentry_issue_spec.rb' - - 'spec/models/snippet_statistics_spec.rb' - - 'spec/models/user_spec.rb' - - 'spec/models/x509_certificate_spec.rb' - - 'spec/requests/api/dependency_proxy_spec.rb' - - 'spec/requests/api/graphql/mutations/container_repository/destroy_spec.rb' - - 'spec/requests/api/group_import_spec.rb' - - 'spec/requests/api/merge_requests_spec.rb' - - 'spec/requests/api/project_container_repositories_spec.rb' - - 'spec/requests/api/project_packages_spec.rb' - - 'spec/requests/lfs_http_spec.rb' - - 'spec/services/admin/propagate_integration_service_spec.rb' - - 'spec/services/admin/propagate_service_template_spec.rb' - - 'spec/services/application_settings/update_service_spec.rb' - - 'spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb' - - 'spec/services/branches/delete_merged_service_spec.rb' - - 'spec/services/branches/delete_service_spec.rb' - - 'spec/services/bulk_import_service_spec.rb' - - 'spec/services/bulk_imports/export_service_spec.rb' - - 'spec/services/ci/create_pipeline_service_spec.rb' - - 'spec/services/ci/list_config_variables_service_spec.rb' - - 'spec/services/ci/pipeline_schedule_service_spec.rb' - - 'spec/services/ci/play_bridge_service_spec.rb' - - 'spec/services/ci/test_failure_history_service_spec.rb' - - 'spec/services/ci/update_build_state_service_spec.rb' - - 'spec/services/clusters/applications/create_service_spec.rb' - - 'spec/services/clusters/applications/schedule_update_service_spec.rb' - - 'spec/services/clusters/applications/update_service_spec.rb' - - 'spec/services/clusters/cleanup/app_service_spec.rb' - - 'spec/services/clusters/cleanup/project_namespace_service_spec.rb' - - 'spec/services/clusters/create_service_spec.rb' - - 'spec/services/container_expiration_policy_service_spec.rb' - - 'spec/services/deployments/create_service_spec.rb' - - 'spec/services/design_management/delete_designs_service_spec.rb' - - 'spec/services/discussions/resolve_service_spec.rb' - - 'spec/services/feature_flags/create_service_spec.rb' - - 'spec/services/feature_flags/update_service_spec.rb' - - 'spec/services/git/branch_hooks_service_spec.rb' - - 'spec/services/git/branch_push_service_spec.rb' - - 'spec/services/git/tag_push_service_spec.rb' - - 'spec/services/grafana/proxy_service_spec.rb' - - 'spec/services/groups/import_export/import_service_spec.rb' - - 'spec/services/groups/transfer_service_spec.rb' - - 'spec/services/groups/update_service_spec.rb' - - 'spec/services/incident_management/pager_duty/process_webhook_service_spec.rb' - - 'spec/services/issuable/bulk_update_service_spec.rb' - - 'spec/services/issues/create_service_spec.rb' - - 'spec/services/issues/update_service_spec.rb' - - 'spec/services/members/destroy_service_spec.rb' - - 'spec/services/merge_requests/handle_assignees_change_service_spec.rb' - - 'spec/services/merge_requests/merge_service_spec.rb' - - 'spec/services/merge_requests/mergeability_check_service_spec.rb' - - 'spec/services/merge_requests/resolve_todos_service_spec.rb' - - 'spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb' - - 'spec/services/notes/create_service_spec.rb' - - 'spec/services/notification_service_spec.rb' - - 'spec/services/onboarding_progress_service_spec.rb' - - 'spec/services/packages/composer/create_package_service_spec.rb' - - 'spec/services/packages/debian/process_changes_service_spec.rb' - - 'spec/services/packages/go/sync_packages_service_spec.rb' - - 'spec/services/pages/delete_service_spec.rb' - - 'spec/services/post_receive_service_spec.rb' - - 'spec/services/projects/after_rename_service_spec.rb' - - 'spec/services/projects/create_service_spec.rb' - - 'spec/services/projects/group_links/create_service_spec.rb' - - 'spec/services/projects/group_links/destroy_service_spec.rb' - - 'spec/services/projects/repository_languages_service_spec.rb' - - 'spec/services/projects/transfer_service_spec.rb' - - 'spec/services/projects/update_service_spec.rb' - - 'spec/services/prometheus/proxy_service_spec.rb' - - 'spec/services/resource_access_tokens/revoke_service_spec.rb' - - 'spec/services/snippets/destroy_service_spec.rb' - - 'spec/services/snippets/update_statistics_service_spec.rb' - - 'spec/services/tags/destroy_service_spec.rb' - - 'spec/services/todos/destroy/entity_leave_service_spec.rb' - - 'spec/services/web_hook_service_spec.rb' - - 'spec/support/services/clusters/create_service_shared.rb' - - 'spec/support/shared_examples/controllers/access_tokens_controller_shared_examples.rb' - - 'spec/support/shared_examples/models/update_project_statistics_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/rubygems_packages_shared_examples.rb' - - 'spec/support/shared_examples/services/alert_management/alert_processing/incident_creation_shared_examples.rb' - - 'spec/support/shared_examples/services/issuable/destroy_service_shared_examples.rb' - - 'spec/support/shared_examples/services/packages_shared_examples.rb' - - 'spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb' - - 'spec/tasks/gitlab/storage_rake_spec.rb' - - 'spec/uploaders/external_diff_uploader_spec.rb' - - 'spec/uploaders/lfs_object_uploader_spec.rb' - - 'spec/workers/authorized_project_update/user_refresh_over_user_range_worker_spec.rb' - - 'spec/workers/build_finished_worker_spec.rb' - - 'spec/workers/bulk_import_worker_spec.rb' - - 'spec/workers/bulk_imports/entity_worker_spec.rb' - - 'spec/workers/bulk_imports/pipeline_worker_spec.rb' - - 'spec/workers/deployments/execute_hooks_worker_spec.rb' - - 'spec/workers/deployments/hooks_worker_spec.rb' - - 'spec/workers/export_csv_worker_spec.rb' - - 'spec/workers/gitlab/github_import/advance_stage_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_base_data_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_lfs_objects_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb' - - 'spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb' - - 'spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb' - - 'spec/workers/issue_placement_worker_spec.rb' - - 'spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb' - - 'spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb' - - 'spec/workers/pages_domain_verification_cron_worker_spec.rb' - - 'spec/workers/post_receive_spec.rb' - - 'spec/workers/project_cache_worker_spec.rb' - - 'spec/workers/repository_check/dispatch_worker_spec.rb' - - 'ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb' - - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_created_event_spec.rb' - - 'ee/spec/models/merge_train_spec.rb' - - 'ee/spec/services/iterations/cadences/create_service_spec.rb' - - 'ee/spec/workers/incident_management/incident_sla_exceeded_check_worker_spec.rb' - - 'ee/spec/workers/iterations/cadences/schedule_create_iterations_worker_spec.rb' - - 'spec/controllers/admin/clusters/applications_controller_spec.rb' - - 'spec/controllers/groups/clusters/applications_controller_spec.rb' - - 'spec/controllers/projects/clusters/applications_controller_spec.rb' - - 'spec/controllers/projects/mirrors_controller_spec.rb' - - 'spec/lib/gitlab/background_migration_spec.rb' - - 'spec/lib/gitlab/github_import/parallel_importer_spec.rb' - - 'spec/requests/api/ci/pipeline_schedules_spec.rb' - - 'spec/services/auto_merge/base_service_spec.rb' - - 'spec/services/git/process_ref_changes_service_spec.rb' - - 'spec/services/merge_requests/base_service_spec.rb' - - 'spec/services/web_hooks/destroy_service_spec.rb' - - 'spec/workers/container_expiration_policy_worker_spec.rb' - - 'spec/workers/namespaces/prune_aggregation_schedules_worker_spec.rb' - - 'ee/spec/services/elastic/indexing_control_service_spec.rb' - - 'ee/spec/support/shared_examples/lib/gitlab/geo/geo_log_cursor_event_shared_examples.rb' - - 'ee/spec/workers/geo/repository_sync_worker_spec.rb' - - 'ee/spec/workers/update_all_mirrors_worker_spec.rb' - - 'spec/lib/gitlab/github_import/parallel_scheduling_spec.rb' - - 'spec/models/clusters/cluster_spec.rb' - - 'spec/services/clusters/applications/destroy_service_spec.rb' - - 'spec/support/shared_examples/models/concerns/repository_storage_movable_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb' - - 'spec/support/shared_examples/requests/self_monitoring_shared_examples.rb' - - 'spec/support/shared_examples/services/repositories/housekeeping_shared_examples.rb' - - 'spec/support/shared_examples/services/schedule_bulk_repository_shard_moves_shared_examples.rb' - - 'spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb' - - 'spec/workers/concerns/limited_capacity/worker_spec.rb' - - 'spec/workers/concerns/reenqueuer_spec.rb' - - 'spec/workers/gitlab/phabricator_import/base_worker_spec.rb' - - 'spec/workers/metrics/dashboard/prune_old_annotations_worker_spec.rb' - # WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/321982 Gitlab/NamespacedClass: Exclude: diff --git a/Gemfile b/Gemfile index ffa901ed05c..d99cd5970e4 100644 --- a/Gemfile +++ b/Gemfile @@ -432,7 +432,6 @@ group :test do gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.12.0' gem 'rspec_junit_formatter' - gem 'rspec-sidekiq' gem 'guard-rspec' # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 diff --git a/Gemfile.lock b/Gemfile.lock index 79ddfa796ba..a1fd31680a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1090,9 +1090,6 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-sidekiq (3.1.0) - rspec-core (~> 3.0, >= 3.0.0) - sidekiq (>= 2.4.0) rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -1608,7 +1605,6 @@ DEPENDENCIES rspec-parameterized rspec-rails (~> 5.0.1) rspec-retry (~> 0.6.1) - rspec-sidekiq rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index 8ea977698e1..e59d7fc058a 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue @@ -26,6 +26,7 @@ import { } from '~/vue_shared/components/paginated_table_with_search_and_tabs/constants'; import PaginatedTableWithSearchAndTabs from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { ALERTS_STATUS_TABS, SEVERITY_LEVELS, trackAlertListViewsOptions } from '../constants'; import getAlertsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql'; @@ -114,6 +115,7 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, + mixins: [glFeatureFlagMixin()], inject: ['projectPath', 'textQuery', 'assigneeUsernameQuery', 'populatingAlertsHelpUrl'], apollo: { alerts: { @@ -275,7 +277,7 @@ export default { - +
- + diff --git a/app/assets/javascripts/vue_shared/components/alerts_deprecation_warning.vue b/app/assets/javascripts/vue_shared/components/alerts_deprecation_warning.vue index 1f293b2150f..16ca2df02c0 100644 --- a/app/assets/javascripts/vue_shared/components/alerts_deprecation_warning.vue +++ b/app/assets/javascripts/vue_shared/components/alerts_deprecation_warning.vue @@ -22,7 +22,12 @@ export default {