From 0ae8428c8e77d5d7e098827be688b1f146321af1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 11 May 2021 21:10:21 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../drawer/pipeline_editor_drawer.vue | 60 +++--- .../javascripts/pipeline_editor/constants.js | 2 + .../components/pipeline_new_form.vue | 15 +- .../javascripts/pipeline_new/constants.js | 3 + .../admin/application_controller.rb | 2 +- .../admin/application_settings_controller.rb | 2 +- app/controllers/admin/dashboard_controller.rb | 2 +- .../admin/dev_ops_report_controller.rb | 2 +- app/controllers/admin/groups_controller.rb | 2 +- .../admin/health_check_controller.rb | 2 +- app/controllers/admin/projects_controller.rb | 2 +- app/controllers/admin/users_controller.rb | 2 +- app/controllers/application_controller.rb | 2 +- app/controllers/autocomplete_controller.rb | 2 +- app/controllers/boards/issues_controller.rb | 2 +- app/controllers/boards/lists_controller.rb | 2 +- .../clusters/clusters_controller.rb | 2 +- .../concerns/authenticates_with_two_factor.rb | 2 +- app/controllers/concerns/boards_actions.rb | 2 +- app/controllers/concerns/boards_responses.rb | 2 +- .../concerns/cycle_analytics_params.rb | 2 +- .../enforces_two_factor_authentication.rb | 2 +- .../concerns/integrations/params.rb | 2 +- app/controllers/concerns/internal_redirect.rb | 2 +- app/controllers/concerns/issuable_actions.rb | 2 +- .../concerns/issuable_collections.rb | 2 +- app/controllers/concerns/lfs_request.rb | 2 +- .../concerns/membership_actions.rb | 2 +- app/controllers/concerns/routable_actions.rb | 2 +- app/controllers/confirmations_controller.rb | 2 +- .../dashboard/projects_controller.rb | 2 +- .../explore/projects_controller.rb | 2 +- .../groups/application_controller.rb | 2 +- .../groups/autocomplete_sources_controller.rb | 2 +- .../groups/group_members_controller.rb | 2 +- .../groups/milestones_controller.rb | 2 +- .../groups/settings/ci_cd_controller.rb | 2 +- .../groups/variables_controller.rb | 2 +- app/controllers/groups_controller.rb | 2 +- app/controllers/import/github_controller.rb | 2 +- .../ldap/omniauth_callbacks_controller.rb | 2 +- .../omniauth_callbacks_controller.rb | 2 +- app/controllers/passwords_controller.rb | 2 +- .../profiles/accounts_controller.rb | 2 +- .../personal_access_tokens_controller.rb | 2 +- .../profiles/preferences_controller.rb | 2 +- .../autocomplete_sources_controller.rb | 2 +- .../projects/environments_controller.rb | 2 +- app/controllers/projects/forks_controller.rb | 2 +- .../projects/group_links_controller.rb | 2 +- .../projects/imports_controller.rb | 2 +- app/controllers/projects/issues_controller.rb | 2 +- .../merge_requests/application_controller.rb | 2 +- .../merge_requests/creations_controller.rb | 2 +- .../projects/merge_requests_controller.rb | 2 +- .../projects/mirrors_controller.rb | 2 +- app/controllers/projects/pages_controller.rb | 2 +- .../projects/pipelines_controller.rb | 2 +- .../projects/project_members_controller.rb | 2 +- .../projects/protected_branches_controller.rb | 2 +- .../projects/protected_refs_controller.rb | 2 +- .../projects/repositories_controller.rb | 2 +- .../security/configuration_controller.rb | 2 +- .../projects/settings/ci_cd_controller.rb | 2 +- .../settings/operations_controller.rb | 2 +- .../settings/repository_controller.rb | 2 +- app/controllers/projects_controller.rb | 2 +- .../registrations/welcome_controller.rb | 2 +- app/controllers/registrations_controller.rb | 2 +- .../git_http_client_controller.rb | 2 +- .../repositories/git_http_controller.rb | 2 +- .../repositories/lfs_api_controller.rb | 2 +- app/controllers/root_controller.rb | 2 +- app/controllers/search_controller.rb | 2 +- .../sent_notifications_controller.rb | 2 +- app/controllers/sessions_controller.rb | 2 +- app/controllers/uploads_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/finders/alert_management/alerts_finder.rb | 2 +- .../http_integrations_finder.rb | 2 +- app/finders/autocomplete/users_finder.rb | 2 +- ...daily_build_group_report_results_finder.rb | 2 +- app/finders/fork_targets_finder.rb | 2 +- app/finders/group_members_finder.rb | 2 +- app/finders/group_projects_finder.rb | 2 +- app/finders/issues_finder.rb | 2 +- app/finders/issues_finder/params.rb | 2 +- app/finders/license_template_finder.rb | 2 +- app/finders/merge_requests_finder.rb | 2 +- app/finders/namespaces/projects_finder.rb | 2 +- app/finders/notes_finder.rb | 2 +- app/finders/projects_finder.rb | 2 +- app/finders/snippets_finder.rb | 2 +- app/finders/template_finder.rb | 2 +- app/finders/todos_finder.rb | 2 +- app/finders/users_finder.rb | 2 +- app/graphql/gitlab_schema.rb | 2 +- .../http_integration/create.rb | 2 +- .../http_integration/http_integration_base.rb | 2 +- .../http_integration/update.rb | 2 +- app/graphql/mutations/boards/create.rb | 2 +- .../boards/issues/issue_move_list.rb | 2 +- app/graphql/mutations/boards/lists/create.rb | 2 +- app/graphql/mutations/boards/update.rb | 2 +- .../mutations/ci/ci_cd_settings_update.rb | 2 +- .../concerns/mutations/resolves_issuable.rb | 2 +- app/graphql/mutations/issues/create.rb | 2 +- app/graphql/mutations/issues/update.rb | 2 +- .../concerns/board_issue_filterable.rb | 2 +- app/graphql/resolvers/issues_resolver.rb | 2 +- .../resolvers/namespace_projects_resolver.rb | 2 +- .../alert_management/http_integration_type.rb | 2 +- app/graphql/types/board_list_type.rb | 2 +- app/graphql/types/board_type.rb | 2 +- .../boards/board_issue_input_base_type.rb | 2 +- .../types/boards/board_issue_input_type.rb | 2 +- .../boards/negated_board_issue_input_type.rb | 2 +- app/graphql/types/ci/pipeline_type.rb | 2 +- app/graphql/types/group_type.rb | 2 +- app/graphql/types/issuable_type.rb | 2 +- app/graphql/types/issue_connection_type.rb | 2 +- app/graphql/types/issue_sort_enum.rb | 2 +- app/graphql/types/issue_type.rb | 2 +- .../issues/negated_issue_filter_input_type.rb | 2 +- app/graphql/types/merge_request_type.rb | 2 +- app/graphql/types/milestone_type.rb | 2 +- app/graphql/types/mutation_type.rb | 2 +- app/graphql/types/namespace_type.rb | 2 +- app/graphql/types/notes/noteable_type.rb | 2 +- app/graphql/types/project_type.rb | 2 +- app/graphql/types/query_type.rb | 2 +- app/graphql/types/todo_target_enum.rb | 2 +- .../user_merge_request_interaction_type.rb | 2 +- app/helpers/analytics/navbar_helper.rb | 2 +- app/helpers/application_settings_helper.rb | 4 +- app/helpers/auth_helper.rb | 4 +- app/helpers/award_emoji_helper.rb | 2 +- app/helpers/boards_helper.rb | 2 +- app/helpers/branches_helper.rb | 2 +- app/helpers/button_helper.rb | 2 +- app/helpers/ci/jobs_helper.rb | 2 +- app/helpers/ci/pipeline_editor_helper.rb | 2 +- app/helpers/ci/runners_helper.rb | 2 +- app/helpers/dashboard_helper.rb | 2 +- app/helpers/emails_helper.rb | 2 +- app/helpers/environments_helper.rb | 2 +- app/helpers/events_helper.rb | 2 +- app/helpers/export_helper.rb | 2 +- app/helpers/feature_flags_helper.rb | 2 +- app/helpers/form_helper.rb | 2 +- app/helpers/gitlab_routing_helper.rb | 2 +- app/helpers/graph_helper.rb | 2 +- app/helpers/groups/group_members_helper.rb | 2 +- app/helpers/groups_helper.rb | 2 +- app/helpers/hooks_helper.rb | 2 +- app/helpers/ide_helper.rb | 2 +- app/helpers/issuables_helper.rb | 2 +- app/helpers/issues_helper.rb | 2 +- app/helpers/kerberos_spnego_helper.rb | 2 +- app/helpers/labels_helper.rb | 2 +- app/helpers/markup_helper.rb | 2 +- app/helpers/merge_requests_helper.rb | 2 +- app/helpers/mirror_helper.rb | 2 +- .../namespace_storage_limit_alert_helper.rb | 2 +- app/helpers/namespaces_helper.rb | 2 +- app/helpers/nav/top_nav_helper.rb | 2 +- app/helpers/nav_helper.rb | 2 +- app/helpers/notes_helper.rb | 2 +- app/helpers/operations_helper.rb | 2 +- app/helpers/preferences_helper.rb | 2 +- app/helpers/profiles_helper.rb | 2 +- app/helpers/projects/incidents_helper.rb | 2 +- .../projects/security/configuration_helper.rb | 2 +- app/helpers/projects_helper.rb | 2 +- app/helpers/releases_helper.rb | 2 +- app/helpers/search_helper.rb | 2 +- app/helpers/selects_helper.rb | 2 +- app/helpers/services_helper.rb | 4 +- app/helpers/sidebars_helper.rb | 2 +- app/helpers/sorting_helper.rb | 2 +- app/helpers/sorting_titles_values_helper.rb | 2 +- app/helpers/subscribable_banner_helper.rb | 2 +- app/helpers/system_note_helper.rb | 4 +- app/helpers/timeboxes_helper.rb | 2 +- app/helpers/timeboxes_routing_helper.rb | 2 +- app/helpers/todos_helper.rb | 2 +- app/helpers/tree_helper.rb | 2 +- app/helpers/user_callouts_helper.rb | 2 +- app/helpers/users_helper.rb | 2 +- app/helpers/version_check_helper.rb | 2 +- app/helpers/wiki_helper.rb | 2 +- app/mailers/emails/issues.rb | 2 +- app/mailers/emails/members.rb | 2 +- app/mailers/emails/merge_requests.rb | 2 +- app/mailers/emails/notes.rb | 2 +- app/mailers/emails/profile.rb | 2 +- app/mailers/emails/projects.rb | 2 +- app/mailers/notify.rb | 2 +- app/mailers/previews/notify_preview.rb | 2 +- app/models/alert_management/alert.rb | 2 +- .../analytics/usage_trends/measurement.rb | 2 +- app/models/application_record.rb | 2 +- app/models/application_setting.rb | 2 +- app/models/audit_event.rb | 2 +- app/models/board.rb | 2 +- app/models/broadcast_message.rb | 2 +- app/models/bulk_imports/stage.rb | 2 +- app/models/ci/bridge.rb | 2 +- app/models/ci/build.rb | 2 +- app/models/ci/build_dependencies.rb | 2 +- .../ci/daily_build_group_report_result.rb | 2 +- app/models/ci/job_artifact.rb | 2 +- app/models/ci/pipeline.rb | 2 +- app/models/ci/pipeline_artifact.rb | 2 +- app/models/ci/pipeline_schedule.rb | 2 +- app/models/ci/runner.rb | 2 +- app/models/ci/trigger.rb | 2 +- app/models/clusters/cluster.rb | 2 +- .../clusters/concerns/application_core.rb | 2 +- app/models/commit_status.rb | 2 +- app/models/concerns/ci/artifactable.rb | 2 +- app/models/concerns/ci/metadatable.rb | 2 +- app/models/concerns/enums/ci/commit_status.rb | 2 +- app/models/concerns/enums/internal_id.rb | 2 +- app/models/concerns/enums/vulnerability.rb | 2 +- app/models/concerns/issuable.rb | 2 +- .../concerns/issue_available_features.rb | 4 +- app/models/concerns/loaded_in_group_list.rb | 2 +- app/models/concerns/mentionable.rb | 2 +- .../concerns/mentionable/reference_regexes.rb | 2 +- app/models/concerns/milestoneable.rb | 2 +- app/models/concerns/noteable.rb | 4 +- app/models/concerns/participable.rb | 2 +- .../project_features_compatibility.rb | 2 +- app/models/concerns/protected_ref.rb | 2 +- app/models/concerns/protected_ref_access.rb | 6 +- app/models/concerns/sha_attribute.rb | 2 +- .../concerns/vulnerability_finding_helpers.rb | 2 +- ...vulnerability_finding_signature_helpers.rb | 2 +- app/models/container_registry/event.rb | 2 +- app/models/container_repository.rb | 2 +- app/models/deployment.rb | 2 +- app/models/description_version.rb | 2 +- app/models/discussion_note.rb | 2 +- app/models/environment.rb | 2 +- app/models/epic.rb | 2 +- app/models/event.rb | 2 +- app/models/gpg_key.rb | 2 +- app/models/group.rb | 2 +- app/models/hooks/project_hook.rb | 2 +- app/models/identity.rb | 2 +- app/models/identity/uniqueness_scopes.rb | 2 +- .../project_incident_management_setting.rb | 2 +- app/models/issue.rb | 2 +- app/models/issue_assignee.rb | 2 +- app/models/issue_link.rb | 2 +- app/models/iteration.rb | 2 +- app/models/key.rb | 2 +- app/models/label.rb | 2 +- app/models/label_note.rb | 2 +- app/models/legacy_diff_note.rb | 2 +- app/models/lfs_object.rb | 2 +- app/models/list.rb | 2 +- app/models/member.rb | 2 +- app/models/members/group_member.rb | 2 +- app/models/members/project_member.rb | 2 +- app/models/members_preloader.rb | 2 +- app/models/merge_request.rb | 2 +- app/models/merge_request/metrics.rb | 2 +- app/models/merge_request_diff.rb | 2 +- app/models/milestone.rb | 2 +- app/models/milestone_release.rb | 2 +- app/models/namespace.rb | 2 +- .../namespace/root_storage_statistics.rb | 2 +- app/models/namespace_setting.rb | 2 +- app/models/note.rb | 2 +- app/models/notification_setting.rb | 2 +- app/models/packages/package_file.rb | 2 +- app/models/pages_domain.rb | 2 +- app/models/personal_access_token.rb | 2 +- app/models/plan.rb | 2 +- app/models/pool_repository.rb | 2 +- app/models/preloaders/labels_preloader.rb | 2 +- app/models/project.rb | 2 +- app/models/project_authorization.rb | 2 +- app/models/project_ci_cd_setting.rb | 2 +- app/models/project_feature.rb | 2 +- app/models/project_feature_usage.rb | 2 +- app/models/project_group_link.rb | 2 +- app/models/project_import_data.rb | 2 +- app/models/project_import_state.rb | 2 +- .../project_services/issue_tracker_service.rb | 2 +- app/models/project_services/jira_service.rb | 2 +- app/models/project_setting.rb | 2 +- app/models/project_statistics.rb | 2 +- app/models/project_team.rb | 2 +- app/models/project_wiki.rb | 2 +- app/models/protected_branch.rb | 2 +- app/models/push_event_payload.rb | 2 +- app/models/release.rb | 2 +- app/models/remote_mirror.rb | 2 +- app/models/repository.rb | 2 +- app/models/resource_label_event.rb | 2 +- app/models/resource_state_event.rb | 2 +- app/models/resource_timebox_event.rb | 2 +- app/models/service.rb | 2 +- app/models/snippet.rb | 2 +- app/models/snippet_repository.rb | 2 +- app/models/system_note_metadata.rb | 2 +- app/models/terraform/state.rb | 2 +- app/models/terraform/state_version.rb | 2 +- app/models/todo.rb | 2 +- app/models/upload.rb | 2 +- app/models/user.rb | 2 +- app/models/user_detail.rb | 2 +- app/models/user_preference.rb | 2 +- app/models/users/merge_request_interaction.rb | 2 +- app/models/users_statistics.rb | 2 +- app/models/vulnerability.rb | 2 +- app/models/wiki.rb | 2 +- app/policies/base_policy.rb | 2 +- app/policies/ci/build_policy.rb | 2 +- app/policies/clusters/instance_policy.rb | 2 +- app/policies/concerns/policy_actor.rb | 2 +- app/policies/concerns/readonly_abilities.rb | 2 +- app/policies/environment_policy.rb | 2 +- app/policies/global_policy.rb | 2 +- app/policies/group_member_policy.rb | 2 +- app/policies/group_policy.rb | 2 +- app/policies/identity_provider_policy.rb | 2 +- app/policies/issuable_policy.rb | 2 +- app/policies/issue_policy.rb | 2 +- app/policies/merge_request_policy.rb | 2 +- app/policies/namespace_policy.rb | 2 +- app/policies/project_policy.rb | 2 +- app/policies/project_snippet_policy.rb | 2 +- app/policies/protected_branch_policy.rb | 2 +- app/policies/user_policy.rb | 2 +- .../alert_management/alert_presenter.rb | 2 +- app/presenters/ci/build_presenter.rb | 2 +- app/presenters/ci/build_runner_presenter.rb | 2 +- app/presenters/ci/pipeline_presenter.rb | 2 +- app/presenters/clusterable_presenter.rb | 2 +- app/presenters/clusters/cluster_presenter.rb | 2 +- app/presenters/commit_status_presenter.rb | 2 +- app/presenters/group_clusterable_presenter.rb | 2 +- app/presenters/group_member_presenter.rb | 2 +- .../instance_clusterable_presenter.rb | 2 +- app/presenters/issue_presenter.rb | 2 +- app/presenters/label_presenter.rb | 2 +- app/presenters/member_presenter.rb | 2 +- app/presenters/merge_request_presenter.rb | 2 +- .../project_clusterable_presenter.rb | 2 +- app/presenters/project_member_presenter.rb | 2 +- app/presenters/project_presenter.rb | 2 +- app/serializers/admin/user_entity.rb | 2 +- app/serializers/blob_entity.rb | 2 +- app/serializers/board_simple_entity.rb | 2 +- app/serializers/build_details_entity.rb | 2 +- app/serializers/ci/pipeline_entity.rb | 2 +- app/serializers/current_board_entity.rb | 2 +- app/serializers/discussion_serializer.rb | 2 +- app/serializers/environment_entity.rb | 2 +- app/serializers/environment_serializer.rb | 2 +- app/serializers/evidences/release_entity.rb | 2 +- app/serializers/fork_namespace_entity.rb | 2 +- app/serializers/group_child_entity.rb | 2 +- .../issuable_sidebar_basic_entity.rb | 2 +- app/serializers/issue_board_entity.rb | 2 +- app/serializers/issue_entity.rb | 2 +- app/serializers/issue_sidebar_basic_entity.rb | 2 +- .../issue_sidebar_extras_entity.rb | 2 +- app/serializers/member_entity.rb | 2 +- app/serializers/member_user_entity.rb | 2 +- ...merge_request_poll_cached_widget_entity.rb | 2 +- .../merge_request_poll_widget_entity.rb | 2 +- app/serializers/merge_request_serializer.rb | 2 +- app/serializers/merge_request_user_entity.rb | 2 +- .../merge_request_widget_entity.rb | 2 +- app/serializers/note_entity.rb | 2 +- app/serializers/note_user_entity.rb | 2 +- app/serializers/pipeline_serializer.rb | 2 +- app/serializers/project_mirror_entity.rb | 2 +- app/serializers/user_entity.rb | 2 +- app/serializers/user_preference_entity.rb | 2 +- app/serializers/user_serializer.rb | 2 +- .../http_integrations/create_service.rb | 2 +- .../http_integrations/update_service.rb | 2 +- .../application_settings/update_service.rb | 2 +- app/services/applications/create_service.rb | 2 +- app/services/audit_event_service.rb | 2 +- ...ntainer_registry_authentication_service.rb | 2 +- app/services/auto_merge_service.rb | 2 +- app/services/award_emojis/add_service.rb | 2 +- app/services/award_emojis/destroy_service.rb | 2 +- app/services/base_count_service.rb | 2 +- app/services/boards/base_service.rb | 2 +- app/services/boards/create_service.rb | 2 +- app/services/boards/issues/create_service.rb | 2 +- app/services/boards/issues/list_service.rb | 2 +- app/services/boards/issues/move_service.rb | 2 +- app/services/boards/lists/create_service.rb | 2 +- app/services/boards/lists/list_service.rb | 2 +- app/services/boards/lists/update_service.rb | 2 +- app/services/boards/update_service.rb | 2 +- app/services/ci/change_variable_service.rb | 2 +- app/services/ci/change_variables_service.rb | 2 +- app/services/ci/create_pipeline_service.rb | 2 +- .../ci/job_artifacts/destroy_batch_service.rb | 2 +- .../ci/pipeline_bridge_status_service.rb | 2 +- app/services/ci/process_build_service.rb | 2 +- app/services/ci/register_job_service.rb | 2 +- app/services/ci/retry_build_service.rb | 2 +- app/services/commits/create_service.rb | 2 +- .../alert_management/alert_processing.rb | 2 +- app/services/concerns/measurable.rb | 2 +- app/services/deploy_keys/create_service.rb | 2 +- .../deployments/update_environment_service.rb | 2 +- .../delete_designs_service.rb | 2 +- .../design_management/save_designs_service.rb | 2 +- app/services/emails/base_service.rb | 2 +- app/services/emails/create_service.rb | 2 +- app/services/emails/destroy_service.rb | 2 +- app/services/event_create_service.rb | 2 +- app/services/git/branch_hooks_service.rb | 2 +- app/services/git/branch_push_service.rb | 2 +- app/services/git/tag_hooks_service.rb | 2 +- app/services/git/wiki_push_service.rb | 2 +- app/services/groups/autocomplete_service.rb | 2 +- app/services/groups/create_service.rb | 2 +- app/services/groups/destroy_service.rb | 2 +- .../groups/import_export/export_service.rb | 2 +- .../groups/import_export/import_service.rb | 2 +- app/services/groups/transfer_service.rb | 2 +- app/services/groups/update_service.rb | 2 +- app/services/ide/schemas_config_service.rb | 2 +- app/services/import/github_service.rb | 2 +- .../integrations/test/project_service.rb | 2 +- app/services/issuable/bulk_update_service.rb | 2 +- .../issuable/clone/attributes_rewriter.rb | 2 +- app/services/issuable/clone/base_service.rb | 2 +- .../issuable/common_system_notes_service.rb | 2 +- app/services/issuable/destroy_service.rb | 2 +- app/services/issuable_base_service.rb | 2 +- app/services/issuable_links/create_service.rb | 2 +- app/services/issue_links/create_service.rb | 2 +- app/services/issues/after_create_service.rb | 2 +- app/services/issues/base_service.rb | 2 +- app/services/issues/build_service.rb | 2 +- app/services/issues/clone_service.rb | 2 +- app/services/issues/create_service.rb | 2 +- app/services/issues/export_csv_service.rb | 2 +- app/services/issues/move_service.rb | 2 +- app/services/issues/update_service.rb | 2 +- app/services/keys/create_service.rb | 2 +- app/services/keys/destroy_service.rb | 2 +- app/services/labels/create_service.rb | 2 +- app/services/labels/promote_service.rb | 2 +- app/services/lfs/lock_file_service.rb | 2 +- app/services/lfs/unlock_file_service.rb | 2 +- .../members/approve_access_request_service.rb | 2 +- app/services/members/create_service.rb | 2 +- app/services/members/destroy_service.rb | 2 +- app/services/members/update_service.rb | 2 +- app/services/merge_request_metrics_service.rb | 2 +- .../merge_requests/after_create_service.rb | 2 +- .../merge_requests/approval_service.rb | 2 +- app/services/merge_requests/base_service.rb | 2 +- app/services/merge_requests/build_service.rb | 2 +- .../merge_requests/create_pipeline_service.rb | 2 +- app/services/merge_requests/create_service.rb | 2 +- .../handle_assignees_change_service.rb | 2 +- .../merge_requests/merge_base_service.rb | 2 +- .../merge_requests/post_merge_service.rb | 2 +- .../merge_requests/refresh_service.rb | 2 +- .../merge_requests/remove_approval_service.rb | 2 +- .../update_assignees_service.rb | 2 +- app/services/merge_requests/update_service.rb | 2 +- app/services/milestones/promote_service.rb | 2 +- app/services/milestones/update_service.rb | 2 +- .../namespace_settings/update_service.rb | 2 +- .../in_product_marketing_emails_service.rb | 2 +- app/services/notes/create_service.rb | 2 +- app/services/notes/destroy_service.rb | 2 +- app/services/notes/post_process_service.rb | 2 +- app/services/notes/quick_actions_service.rb | 2 +- app/services/notes/update_service.rb | 2 +- .../builder/default.rb | 2 +- app/services/notification_service.rb | 2 +- .../personal_access_tokens/create_service.rb | 2 +- .../personal_access_tokens/revoke_service.rb | 2 +- app/services/post_receive_service.rb | 2 +- app/services/preview_markdown_service.rb | 2 +- app/services/projects/after_rename_service.rb | 2 +- app/services/projects/autocomplete_service.rb | 2 +- app/services/projects/cleanup_service.rb | 2 +- .../projects/create_from_template_service.rb | 2 +- app/services/projects/create_service.rb | 2 +- app/services/projects/destroy_service.rb | 2 +- .../projects/disable_deploy_key_service.rb | 2 +- .../projects/enable_deploy_key_service.rb | 2 +- .../gitlab_projects_import_service.rb | 2 +- .../projects/group_links/create_service.rb | 2 +- .../projects/group_links/destroy_service.rb | 2 +- .../migrate_attachments_service.rb | 2 +- .../migrate_repository_service.rb | 2 +- app/services/projects/import_service.rb | 2 +- .../projects/operations/update_service.rb | 2 +- app/services/projects/transfer_service.rb | 2 +- app/services/projects/update_pages_service.rb | 2 +- app/services/projects/update_service.rb | 2 +- .../protected_branches/access_level_params.rb | 2 +- .../protected_branches/api_service.rb | 2 +- .../protected_branches/create_service.rb | 2 +- .../protected_branches/destroy_service.rb | 2 +- .../legacy_api_update_service.rb | 2 +- .../protected_branches/update_service.rb | 2 +- .../quick_actions/interpret_service.rb | 2 +- app/services/quick_actions/target_service.rb | 2 +- app/services/releases/base_service.rb | 2 +- .../releases/create_evidence_service.rb | 2 +- .../resource_access_tokens/create_service.rb | 2 +- .../resource_access_tokens/revoke_service.rb | 2 +- .../resource_events/change_labels_service.rb | 2 +- .../merge_into_notes_service.rb | 2 +- app/services/search/global_service.rb | 2 +- app/services/search/group_service.rb | 2 +- app/services/search/project_service.rb | 2 +- app/services/search/snippet_service.rb | 2 +- app/services/search_service.rb | 2 +- app/services/snippets/destroy_service.rb | 2 +- app/services/system_note_service.rb | 2 +- .../system_notes/issuables_service.rb | 2 +- app/services/todo_service.rb | 2 +- .../todos/destroy/entity_leave_service.rb | 2 +- .../user_project_access_changed_service.rb | 2 +- app/services/users/activity_service.rb | 2 +- app/services/users/approve_service.rb | 2 +- app/services/users/block_service.rb | 2 +- app/services/users/build_service.rb | 2 +- app/services/users/create_service.rb | 2 +- app/services/users/destroy_service.rb | 2 +- .../users/migrate_to_ghost_user_service.rb | 2 +- app/services/users/reject_service.rb | 2 +- app/services/users/update_service.rb | 2 +- app/services/wiki_pages/base_service.rb | 2 +- app/uploaders/object_storage.rb | 2 +- app/validators/json_schema_validator.rb | 2 +- app/workers/build_finished_worker.rb | 2 +- app/workers/issuable_export_csv_worker.rb | 2 +- .../in_product_marketing_emails_worker.rb | 2 +- app/workers/post_receive.rb | 2 +- app/workers/project_cache_worker.rb | 2 +- app/workers/repository_check/batch_worker.rb | 2 +- .../single_repository_worker.rb | 2 +- app/workers/repository_import_worker.rb | 2 +- .../0_inject_enterprise_edition_module.rb | 38 ++-- doc/development/creating_enums.md | 2 +- doc/development/ee_features.md | 32 ++-- doc/development/service_measurement.md | 2 +- .../testing_guide/end_to_end/page_objects.md | 2 +- lib/api/api.rb | 2 +- lib/api/boards.rb | 2 +- lib/api/entities/application_setting.rb | 2 +- lib/api/entities/board.rb | 2 +- lib/api/entities/group.rb | 2 +- lib/api/entities/group_detail.rb | 2 +- lib/api/entities/identity.rb | 2 +- lib/api/entities/issue.rb | 2 +- lib/api/entities/issue_basic.rb | 2 +- lib/api/entities/job_request/response.rb | 2 +- lib/api/entities/list.rb | 2 +- lib/api/entities/member.rb | 2 +- lib/api/entities/merge_request_basic.rb | 2 +- lib/api/entities/namespace.rb | 2 +- lib/api/entities/project.rb | 2 +- lib/api/entities/protected_branch.rb | 2 +- lib/api/entities/protected_ref_access.rb | 2 +- lib/api/entities/todo.rb | 2 +- lib/api/entities/user_basic.rb | 2 +- lib/api/entities/user_details_with_admin.rb | 2 +- lib/api/entities/user_path.rb | 2 +- lib/api/entities/user_public.rb | 2 +- lib/api/entities/user_with_admin.rb | 2 +- lib/api/features.rb | 2 +- lib/api/group_boards.rb | 2 +- lib/api/group_milestones.rb | 2 +- lib/api/groups.rb | 2 +- lib/api/helpers.rb | 2 +- lib/api/helpers/award_emoji.rb | 2 +- lib/api/helpers/common_helpers.rb | 2 +- lib/api/helpers/discussions_helpers.rb | 2 +- lib/api/helpers/groups_helpers.rb | 2 +- lib/api/helpers/issues_helpers.rb | 2 +- lib/api/helpers/members_helpers.rb | 2 +- lib/api/helpers/notes_helpers.rb | 2 +- lib/api/helpers/project_snapshots_helpers.rb | 2 +- lib/api/helpers/projects_helpers.rb | 2 +- lib/api/helpers/protected_branches_helpers.rb | 2 +- .../helpers/resource_label_events_helpers.rb | 2 +- lib/api/helpers/runner.rb | 2 +- lib/api/helpers/search_helpers.rb | 2 +- lib/api/helpers/services_helpers.rb | 2 +- lib/api/helpers/settings_helpers.rb | 2 +- lib/api/helpers/users_helpers.rb | 2 +- lib/api/helpers/variables_helpers.rb | 2 +- lib/api/helpers/wikis_helpers.rb | 2 +- lib/api/internal/base.rb | 2 +- lib/api/internal/kubernetes.rb | 2 +- lib/api/issues.rb | 2 +- lib/api/job_artifacts.rb | 2 +- lib/api/jobs.rb | 2 +- lib/api/members.rb | 2 +- lib/api/merge_request_approvals.rb | 2 +- lib/api/merge_requests.rb | 2 +- lib/api/namespaces.rb | 2 +- lib/api/project_milestones.rb | 2 +- lib/api/projects.rb | 2 +- lib/api/protected_branches.rb | 2 +- lib/api/releases.rb | 2 +- lib/api/search.rb | 2 +- lib/api/services.rb | 2 +- lib/api/settings.rb | 2 +- lib/api/todos.rb | 2 +- .../validators/check_assignees_count.rb | 2 +- lib/backup/repositories.rb | 2 +- .../references/epic_reference_filter.rb | 2 +- .../references/iteration_reference_filter.rb | 2 +- .../references/label_reference_filter.rb | 2 +- .../filter/references/reference_cache.rb | 2 +- .../vulnerability_reference_filter.rb | 2 +- lib/banzai/filter/sanitization_filter.rb | 2 +- lib/banzai/issuable_extractor.rb | 2 +- lib/banzai/pipeline/gfm_pipeline.rb | 2 +- lib/banzai/pipeline/post_process_pipeline.rb | 2 +- lib/banzai/pipeline/single_line_pipeline.rb | 2 +- lib/banzai/reference_parser/epic_parser.rb | 2 +- .../reference_parser/iteration_parser.rb | 2 +- .../reference_parser/vulnerability_parser.rb | 2 +- lib/container_registry/client.rb | 2 +- lib/declarative_enum.rb | 2 +- lib/event_filter.rb | 2 +- lib/feature.rb | 2 +- lib/feature/definition.rb | 2 +- lib/gitlab/access.rb | 2 +- lib/gitlab/alert_management/payload.rb | 2 +- .../alert_management/payload/generic.rb | 2 +- .../cycle_analytics/base_query_builder.rb | 2 +- .../cycle_analytics/data_collector.rb | 2 +- .../cycle_analytics/records_fetcher.rb | 2 +- .../analytics/cycle_analytics/stage_events.rb | 2 +- lib/gitlab/application_context.rb | 2 +- lib/gitlab/auth.rb | 2 +- lib/gitlab/auth/auth_finders.rb | 2 +- lib/gitlab/auth/ldap/access.rb | 2 +- lib/gitlab/auth/ldap/adapter.rb | 2 +- lib/gitlab/auth/ldap/config.rb | 2 +- lib/gitlab/auth/ldap/person.rb | 2 +- lib/gitlab/auth/ldap/user.rb | 2 +- lib/gitlab/auth/o_auth/auth_hash.rb | 2 +- lib/gitlab/auth/o_auth/user.rb | 2 +- lib/gitlab/auth/result.rb | 2 +- lib/gitlab/auth/saml/config.rb | 2 +- lib/gitlab/auth/saml/user.rb | 2 +- .../backfill_version_data_from_gitaly.rb | 2 +- .../fix_orphan_promoted_issues.rb | 2 +- .../fix_ruby_object_in_audit_events.rb | 2 +- .../generate_gitlab_subscriptions.rb | 2 +- .../migrate_approver_to_approval_rules.rb | 2 +- ...prover_to_approval_rules_check_progress.rb | 2 +- ...ate_approver_to_approval_rules_in_batch.rb | 2 +- .../migrate_devops_segments_to_groups.rb | 2 +- .../migrate_security_scans.rb | 2 +- .../move_epic_issues_after_epics.rb | 2 +- ...te_any_approval_rule_for_merge_requests.rb | 2 +- ...populate_any_approval_rule_for_projects.rb | 2 +- .../populate_namespace_statistics.rb | 2 +- ...ulate_resolved_on_default_branch_column.rb | 2 +- .../populate_uuids_for_security_findings.rb | 2 +- ...late_vulnerability_feedback_pipeline_id.rb | 2 +- ...ate_vulnerability_historical_statistics.rb | 2 +- .../prune_orphaned_geo_events.rb | 2 +- .../remove_duplicate_cs_findings.rb | 2 +- ...ed_cs_findings_without_vulnerability_id.rb | 2 +- .../remove_inaccessible_epic_todos.rb | 2 +- ...e_undefined_occurrence_confidence_level.rb | 2 +- ...ove_undefined_occurrence_severity_level.rb | 2 +- ...ndefined_vulnerability_confidence_level.rb | 2 +- ..._undefined_vulnerability_severity_level.rb | 2 +- .../sync_blocking_issues_count.rb | 2 +- ...erprint_for_container_scanning_findings.rb | 2 +- ...vulnerabilities_from_dismissal_feedback.rb | 2 +- .../update_vulnerabilities_to_dismissed.rb | 2 +- .../update_vulnerability_confidence.rb | 2 +- .../user_mentions/models/namespace.rb | 2 +- lib/gitlab/checks/base_checker.rb | 2 +- lib/gitlab/checks/change_access.rb | 2 +- lib/gitlab/checks/diff_check.rb | 2 +- lib/gitlab/checks/matching_merge_request.rb | 2 +- lib/gitlab/ci/config.rb | 2 +- lib/gitlab/ci/config/entry/job.rb | 2 +- lib/gitlab/ci/config/entry/need.rb | 2 +- lib/gitlab/ci/config/entry/needs.rb | 2 +- lib/gitlab/ci/jwt.rb | 2 +- lib/gitlab/ci/parsers.rb | 2 +- .../ci/pipeline/chain/config/content.rb | 2 +- .../ci/pipeline/chain/limit/activity.rb | 2 +- .../ci/pipeline/chain/limit/job_activity.rb | 2 +- lib/gitlab/ci/pipeline/chain/limit/size.rb | 2 +- .../ci/pipeline/chain/validate/abilities.rb | 2 +- .../ci/pipeline/chain/validate/external.rb | 2 +- .../validate/security_orchestration_policy.rb | 2 +- lib/gitlab/ci/status/build/failed.rb | 2 +- .../templates/Security/DAST-API.gitlab-ci.yml | 48 +++++ .../Security/DAST.latest.gitlab-ci.yml | 46 ----- lib/gitlab/ci/trace.rb | 2 +- .../cleanup/orphan_job_artifact_files.rb | 2 +- .../orphan_job_artifact_files_batch.rb | 2 +- lib/gitlab/database.rb | 6 +- lib/gitlab/database/consistency.rb | 2 +- lib/gitlab/email/handler/reply_processing.rb | 2 +- lib/gitlab/etag_caching/router/restful.rb | 2 +- lib/gitlab/exclusive_lease.rb | 2 +- lib/gitlab/fake_application_settings.rb | 2 +- lib/gitlab/favicon.rb | 2 +- lib/gitlab/git_access.rb | 2 +- lib/gitlab/git_access_design.rb | 2 +- lib/gitlab/git_access_snippet.rb | 2 +- lib/gitlab/git_access_wiki.rb | 2 +- lib/gitlab/github_import/parallel_importer.rb | 2 +- lib/gitlab/gl_repository/repo_type.rb | 2 +- lib/gitlab/gon_helper.rb | 2 +- .../graphql/pagination/keyset/order_info.rb | 2 +- lib/gitlab/group_search_results.rb | 2 +- lib/gitlab/hook_data/group_member_builder.rb | 2 +- lib/gitlab/hook_data/issue_builder.rb | 2 +- lib/gitlab/hook_data/user_builder.rb | 2 +- .../import_export/project/relation_factory.rb | 2 +- lib/gitlab/import_export/repo_restorer.rb | 2 +- lib/gitlab/import_export/wiki_repo_saver.rb | 2 +- lib/gitlab/import_sources.rb | 2 +- lib/gitlab/issuable_metadata.rb | 2 +- .../metrics/samplers/database_sampler.rb | 2 +- .../metrics/subscribers/active_record.rb | 2 +- lib/gitlab/middleware/read_only/controller.rb | 2 +- lib/gitlab/object_hierarchy.rb | 2 +- lib/gitlab/omniauth_initializer.rb | 2 +- lib/gitlab/patch/draw_route.rb | 2 +- lib/gitlab/path_regex.rb | 2 +- lib/gitlab/project_template.rb | 2 +- lib/gitlab/prometheus/metric_group.rb | 2 +- .../queries/query_additional_metrics.rb | 2 +- lib/gitlab/rack_attack.rb | 2 +- lib/gitlab/rack_attack/request.rb | 2 +- lib/gitlab/repo_path.rb | 2 +- lib/gitlab/repository_size_checker.rb | 2 +- lib/gitlab/search/parsed_query.rb | 2 +- lib/gitlab/search_context.rb | 2 +- lib/gitlab/search_results.rb | 2 +- lib/gitlab/sidekiq_middleware.rb | 2 +- .../sidekiq_middleware/server_metrics.rb | 2 +- .../slash_commands/presenters/issue_base.rb | 2 +- lib/gitlab/snippet_search_results.rb | 2 +- lib/gitlab/template/gitlab_ci_yml_template.rb | 2 +- lib/gitlab/tree_summary.rb | 2 +- lib/gitlab/uploads/migration_helper.rb | 2 +- lib/gitlab/url_builder.rb | 2 +- lib/gitlab/usage/metric_definition.rb | 2 +- .../usage/metrics/aggregates/aggregate.rb | 2 +- lib/gitlab/usage_data.rb | 2 +- .../usage_data_counters/hll_redis_counter.rb | 2 +- .../issue_activity_unique_counter.rb | 2 +- lib/gitlab/web_ide/config/entry/global.rb | 2 +- lib/peek/views/active_record.rb | 2 +- lib/sidebars/projects/menus/analytics_menu.rb | 2 +- lib/sidebars/projects/menus/ci_cd_menu.rb | 2 +- lib/sidebars/projects/menus/issues_menu.rb | 2 +- .../projects/menus/operations_menu.rb | 2 +- .../projects/menus/repository_menu.rb | 2 +- .../menus/security_compliance_menu.rb | 2 +- lib/sidebars/projects/panel.rb | 2 +- lib/system_check/rake_task/app_task.rb | 2 +- lib/system_check/rake_task/gitlab_task.rb | 2 +- qa/qa/page/admin/menu.rb | 2 +- qa/qa/page/admin/overview/groups/edit.rb | 2 +- qa/qa/page/component/issue_board/show.rb | 2 +- qa/qa/page/dashboard/projects.rb | 2 +- qa/qa/page/file/show.rb | 2 +- qa/qa/page/group/menu.rb | 2 +- qa/qa/page/group/settings/general.rb | 2 +- qa/qa/page/main/menu.rb | 2 +- qa/qa/page/merge_request/new.rb | 2 +- qa/qa/page/merge_request/show.rb | 2 +- qa/qa/page/milestone/show.rb | 2 +- qa/qa/page/profile/menu.rb | 2 +- qa/qa/page/project/issue/index.rb | 2 +- qa/qa/page/project/issue/show.rb | 2 +- qa/qa/page/project/job/show.rb | 2 +- qa/qa/page/project/menu.rb | 2 +- qa/qa/page/project/new.rb | 2 +- qa/qa/page/project/operations/metrics/show.rb | 2 +- qa/qa/page/project/packages/index.rb | 2 +- qa/qa/page/project/pipeline/index.rb | 2 +- qa/qa/page/project/pipeline/show.rb | 2 +- qa/qa/page/project/settings/ci_cd.rb | 2 +- qa/qa/page/project/settings/integrations.rb | 2 +- qa/qa/page/project/settings/main.rb | 2 +- qa/qa/page/project/settings/merge_request.rb | 2 +- .../settings/mirroring_repositories.rb | 2 +- .../project/settings/protected_branches.rb | 2 +- qa/qa/page/project/settings/protected_tags.rb | 2 +- qa/qa/page/project/settings/repository.rb | 2 +- qa/qa/page/project/show.rb | 2 +- qa/qa/page/project/snippet/index.rb | 2 +- qa/qa/page/project/web_ide/edit.rb | 2 +- qa/qa/page/project/wiki/show.rb | 2 +- qa/qa/page/registration/welcome.rb | 2 +- qa/qa/runtime/env.rb | 2 +- qa/qa/scenario/test/sanity/selectors.rb | 2 +- .../cop/inject_enterprise_edition_module.rb | 14 +- .../inject_enterprise_edition_module_spec.rb | 26 +-- spec/db/schema_spec.rb | 2 +- .../drawer/pipeline_editor_drawer_spec.js | 42 ++++- .../components/pipeline_new_form_spec.js | 37 +++- spec/frontend/pipeline_new/mock_data.js | 6 + .../lib/gitlab/ci/templates/templates_spec.rb | 34 +++- .../inject_enterprise_edition_module_spec.rb | 178 ++++-------------- spec/support/db_cleaner.rb | 2 +- spec/support/helpers/ldap_helpers.rb | 2 +- spec/support/helpers/license_helper.rb | 2 +- spec/support/helpers/login_helpers.rb | 2 +- spec/support/helpers/migrations_helpers.rb | 2 +- spec/support/helpers/require_migration.rb | 2 +- spec/support/helpers/stub_configuration.rb | 2 +- spec/support/helpers/stub_gitlab_calls.rb | 2 +- spec/support/helpers/test_env.rb | 4 +- spec/support/matchers/markdown_matchers.rb | 2 +- 838 files changed, 1124 insertions(+), 1125 deletions(-) create mode 100644 lib/gitlab/ci/templates/Security/DAST-API.gitlab-ci.yml diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index e61829399ec..2da22589433 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -4a1b0d4018ee35cfe786ba3dd975b20013a39e39 +8d525bfb986a26ee6c1c6d0ec976fa2614928cf8 diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue b/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue index e1f38b4332b..3f4da0a0641 100644 --- a/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue +++ b/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue @@ -1,6 +1,8 @@ diff --git a/app/assets/javascripts/pipeline_editor/constants.js b/app/assets/javascripts/pipeline_editor/constants.js index 56862f17858..dba815368eb 100644 --- a/app/assets/javascripts/pipeline_editor/constants.js +++ b/app/assets/javascripts/pipeline_editor/constants.js @@ -26,3 +26,5 @@ export const TABS_WITH_COMMIT_FORM = [CREATE_TAB, LINT_TAB, VISUALIZE_TAB]; export const COMMIT_ACTION_CREATE = 'CREATE'; export const COMMIT_ACTION_UPDATE = 'UPDATE'; + +export const DRAWER_EXPANDED_KEY = 'pipeline_editor_drawer_expanded'; diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue index 06ea9188113..5472e51445a 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -21,7 +21,12 @@ import { backOff } from '~/lib/utils/common_utils'; import httpStatusCodes from '~/lib/utils/http_status'; import { redirectTo } from '~/lib/utils/url_utility'; import { s__, __, n__ } from '~/locale'; -import { VARIABLE_TYPE, FILE_TYPE, CONFIG_VARIABLES_TIMEOUT } from '../constants'; +import { + VARIABLE_TYPE, + FILE_TYPE, + CONFIG_VARIABLES_TIMEOUT, + CC_VALIDATION_REQUIRED_ERROR, +} from '../constants'; import filterVariables from '../utils/filter_variables'; import RefsDropdown from './refs_dropdown.vue'; @@ -60,6 +65,8 @@ export default { GlSprintf, GlLoadingIcon, RefsDropdown, + CcValidationRequiredAlert: () => + import('ee_component/billings/components/cc_validation_required_alert.vue'), }, directives: { SafeHtml }, props: { @@ -143,6 +150,9 @@ export default { descriptions() { return this.form[this.refFullName]?.descriptions ?? {}; }, + ccRequiredError() { + return this.error === CC_VALIDATION_REQUIRED_ERROR; + }, }, watch: { refValue() { @@ -329,8 +339,9 @@ export default {