From bb27269b9b711c83d3228bdac2250e84121ea002 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 26 Mar 2024 18:09:43 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../edit/components/jira_issues_fields.vue | 7 +- .../javascripts/integrations/edit/index.js | 2 + .../experiments/show/ml_experiments_show.vue | 146 ++++++----- .../routes/experiments/show/translations.js | 2 + app/assets/javascripts/settings_panels.js | 4 + .../assignees/issuable_assignees.vue | 2 +- .../components/crm_contacts/crm_contacts.vue | 7 +- .../labels_select_root.vue | 1 + .../components/participants/participants.vue | 5 +- .../components/reviewers/reviewer_title.vue | 4 +- .../reviewers/sidebar_reviewers.vue | 1 + .../reviewers/uncollapsed_reviewer_list.vue | 7 +- .../snippets/components/snippet_header.vue | 186 +++++++------ .../stylesheets/components/detail_page.scss | 5 - .../page_bundles/ml_experiment_tracking.scss | 1 + .../concerns/integrations/params.rb | 1 - app/controllers/search_controller.rb | 25 +- .../types/merge_request_review_state_enum.rb | 4 + .../detailed_merge_status_enum.rb | 2 + app/helpers/projects/ml/experiments_helper.rb | 1 + .../concerns/merge_request_reviewer_state.rb | 4 +- app/models/integrations/jira.rb | 6 +- app/models/merge_request.rb | 8 + .../merge_requests/approval_service.rb | 3 +- app/services/merge_requests/base_service.rb | 6 + .../merge_requests/remove_approval_service.rb | 2 +- .../shared/empty_states/_snippets.html.haml | 2 +- .../events/click_expand_panel_on_settings.yml | 20 ++ ...click_expand_panel_on_settings_monthly.yml | 24 ++ ..._click_expand_panel_on_settings_weekly.yml | 24 ++ db/docs/error_tracking_client_keys.yml | 10 +- db/docs/error_tracking_errors.yml | 10 +- db/docs/project_error_tracking_settings.yml | 10 +- .../audit_event_streaming/examples.md | 11 - doc/administration/audit_events.md | 11 - doc/administration/audit_reports.md | 11 - doc/administration/compliance.md | 4 +- doc/administration/logs/index.md | 2 +- .../settings/account_and_limit_settings.md | 2 +- .../settings/import_and_export_settings.md | 21 +- doc/api/graphql/reference/index.md | 4 + doc/api/merge_requests.md | 3 +- .../gitlab_events_platform/index.md | 2 +- doc/ci/components/catalog.md | 11 - doc/ci/jobs/job_control.md | 246 +----------------- doc/ci/yaml/index.md | 17 +- .../create_source_code_be/rest_endpoints.md | 11 - doc/development/runner_fleet_dashboard.md | 11 - doc/integration/jira/issues.md | 2 +- .../responding_to_security_incidents.md | 10 +- doc/security/webhooks.md | 12 + doc/subscriptions/bronze_starter.md | 2 +- doc/topics/git/index.md | 1 - doc/topics/git/lfs/troubleshooting.md | 2 +- doc/topics/git/useful_git_commands.md | 11 - .../index.md | 16 +- .../dast/on-demand_scan.md | 2 +- doc/user/gitlab_duo_chat.md | 10 +- doc/user/group/access_and_permissions.md | 2 +- doc/user/group/saml_sso/troubleshooting.md | 2 +- doc/user/permissions.md | 2 +- doc/user/project/git_attributes.md | 7 +- doc/user/project/issues/managing_issues.md | 2 +- .../project/organize_work_with_projects.md | 2 +- lib/api/merge_request_approvals.rb | 4 - .../DAST-Default-Branch-Deploy.gitlab-ci.yml | 2 +- .../ci/templates/Jobs/Deploy.gitlab-ci.yml | 2 +- .../Jobs/Deploy.latest.gitlab-ci.yml | 2 +- .../OpenTofu/Base.latest.gitlab-ci.yml | 2 +- .../quick_actions/merge_request_actions.rb | 4 - locale/gitlab.pot | 12 + package.json | 2 +- qa/qa/page/component/snippet.rb | 3 +- .../repository/license_detection_spec.rb | 3 +- spec/controllers/search_controller_spec.rb | 29 +++ spec/factories/integrations.rb | 7 +- .../snippets/user_deletes_snippet_spec.rb | 20 +- .../snippets/user_deletes_snippet_spec.rb | 15 +- .../show/ml_experiments_show_spec.js | 46 +++- .../routes/experiments/show/mock_data.js | 25 +- .../components/snippet_header_spec.js | 124 ++++----- .../merge_request_review_state_enum_spec.rb | 8 + .../projects/ml/experiments_helper_spec.rb | 8 +- spec/models/integrations/jira_spec.rb | 6 + spec/models/merge_request_spec.rb | 26 ++ spec/requests/api/graphql/ci/jobs_spec.rb | 2 +- .../api/graphql/project/merge_request_spec.rb | 6 +- .../api/merge_request_approvals_spec.rb | 2 +- .../merge_requests/approval_service_spec.rb | 6 + .../remove_approval_service_spec.rb | 8 +- .../quick_actions/interpret_service_spec.rb | 2 +- .../features/snippets_shared_examples.rb | 4 + yarn.lock | 8 +- 93 files changed, 712 insertions(+), 670 deletions(-) create mode 100644 config/events/click_expand_panel_on_settings.yml create mode 100644 config/metrics/counts_28d/count_distinct_user_id_from_click_expand_panel_on_settings_monthly.yml create mode 100644 config/metrics/counts_7d/count_distinct_user_id_from_click_expand_panel_on_settings_weekly.yml delete mode 100644 doc/administration/audit_event_streaming/examples.md delete mode 100644 doc/administration/audit_events.md delete mode 100644 doc/administration/audit_reports.md delete mode 100644 doc/ci/components/catalog.md delete mode 100644 doc/development/backend/create_source_code_be/rest_endpoints.md delete mode 100644 doc/development/runner_fleet_dashboard.md delete mode 100644 doc/topics/git/useful_git_commands.md diff --git a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue index 46128fd6559..242ac69555b 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue @@ -46,6 +46,11 @@ export default { required: false, default: null, }, + initialProjectKeys: { + type: String, + required: false, + default: null, + }, isValidated: { type: Boolean, required: false, @@ -56,7 +61,7 @@ export default { return { enableJiraIssues: this.initialEnableJiraIssues, projectKey: this.initialProjectKey, - projectKeys: null, + projectKeys: this.initialProjectKeys, }; }, computed: { diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js index bb0b650898a..85a4e0494e6 100644 --- a/app/assets/javascripts/integrations/edit/index.js +++ b/app/assets/javascripts/integrations/edit/index.js @@ -22,6 +22,7 @@ function parseDatasetToProps(data) { projectId, commentDetail, projectKey, + projectKeys, learnMorePath, aboutPricingUrl, triggerEvents, @@ -88,6 +89,7 @@ function parseDatasetToProps(data) { initialEnableJiraVulnerabilities: enableJiraVulnerabilities, initialVulnerabilitiesIssuetype: vulnerabilitiesIssuetype, initialProjectKey: projectKey, + initialProjectKeys: projectKeys, }, googleCloudArtifactRegistryProps: { artifactRegistryPath, diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue index afd48df93e4..f492c3ec358 100644 --- a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue +++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue @@ -1,4 +1,5 @@