From 419c53ec62de6e97a517abd5fdd4cbde3a942a34 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Oct 2023 12:57:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@16-5-stable-ee --- .../callouts/rich_text_editor_illustration.svg | 79 --- app/assets/images/jobs-empty-state.svg | 33 -- .../abuse_report/components/report_actions.vue | 15 +- .../admin/abuse_report/components/user_details.vue | 3 - .../javascripts/admin/abuse_report/constants.js | 6 +- .../inactive_project_deletion/components/form.vue | 6 +- .../components/datetime_picker.vue | 2 +- app/assets/javascripts/alert.js | 54 +- .../components/alert_management_empty_state.vue | 6 +- .../analytics/cycle_analytics/components/base.vue | 4 + .../cycle_analytics/components/stage_table.vue | 1 + .../components/value_stream_filters.vue | 124 ++++- .../analytics/cycle_analytics/store/actions.js | 4 + .../cycle_analytics/store/mutation_types.js | 1 + .../analytics/cycle_analytics/store/mutations.js | 3 + .../analytics/cycle_analytics/store/state.js | 1 + .../devops_reports/components/devops_score.vue | 1 + .../components/service_ping_disabled.vue | 6 +- .../shared/components/date_ranges_dropdown.vue | 131 +++++ .../analytics/shared/components/daterange.vue | 23 +- .../shared/components/projects_dropdown_filter.vue | 24 +- .../javascripts/analytics/shared/constants.js | 69 ++- app/assets/javascripts/api.js | 14 - app/assets/javascripts/badges/components/badge.vue | 2 +- .../javascripts/badges/components/badge_list.vue | 4 +- .../batch_comments/components/preview_dropdown.vue | 8 +- .../batch_comments/components/review_bar.vue | 2 +- .../batch_comments/components/submit_dropdown.vue | 6 +- app/assets/javascripts/behaviors/autosize.js | 11 +- .../behaviors/components/global_alerts.vue | 50 ++ app/assets/javascripts/behaviors/global_alerts.js | 17 + app/assets/javascripts/behaviors/index.js | 3 + .../javascripts/behaviors/markdown/render_gfm.js | 14 +- .../javascripts/behaviors/markdown/render_math.js | 45 +- .../behaviors/markdown/render_observability.js | 25 - .../javascripts/behaviors/preview_markdown.js | 20 +- .../javascripts/blob/components/blob_content.vue | 2 +- .../blob/components/blob_edit_header.vue | 2 +- .../components/blob_header_default_actions.vue | 5 +- .../blob/components/blob_header_filepath.vue | 2 +- app/assets/javascripts/blob/csv/constants.js | 1 + app/assets/javascripts/blob/csv/csv_viewer.vue | 35 +- .../javascripts/boards/components/board_app.vue | 4 +- .../javascripts/boards/components/board_card.vue | 43 +- .../boards/components/board_card_inner.vue | 12 +- .../javascripts/boards/components/board_column.vue | 2 +- .../boards/components/board_content.vue | 2 +- .../javascripts/boards/components/board_form.vue | 30 +- .../javascripts/boards/components/board_list.vue | 2 +- .../boards/components/board_list_header.vue | 11 +- .../boards/components/board_top_bar.vue | 3 +- .../boards/components/boards_selector.vue | 272 ++++------ .../boards/components/config_toggle.vue | 2 +- .../components/issue_board_filtered_search.vue | 12 +- .../javascripts/boards/components/toggle_focus.vue | 2 +- .../javascripts/boards/graphql/cache_updates.js | 4 +- .../client/selected_board_items.query.graphql | 3 + .../set_selected_board_items.mutation.graphql | 3 + .../unset_selected_board_items.mutation.graphql | 3 + .../javascripts/boards/issue_board_filters.js | 14 - app/assets/javascripts/boards/stores/actions.js | 6 +- .../branches/components/delete_merged_branches.vue | 19 +- .../branches/components/sort_dropdown.vue | 4 +- .../jobs_table/components/cells/project_cell.vue | 2 +- .../jobs_table/components/cells/runner_cell.vue | 17 +- .../javascripts/ci/admin/jobs_table/constants.js | 3 - .../graphql/queries/get_all_jobs.query.graphql | 1 + .../ci/artifacts/components/bulk_delete_modal.vue | 1 + .../artifacts/components/job_artifacts_table.vue | 67 +-- .../ci/catalog/components/ci_catalog_home.vue | 8 + .../components/details/ci_resource_about.vue | 120 +++++ .../components/details/ci_resource_components.vue | 103 ++++ .../components/details/ci_resource_details.vue | 41 ++ .../components/details/ci_resource_header.vue | 130 +++++ .../details/ci_resource_header_skeleton_loader.vue | 13 + .../components/details/ci_resource_readme.vue | 55 ++ .../ci/catalog/components/list/catalog_header.vue | 59 ++ .../list/catalog_list_skeleton_loader.vue | 57 ++ .../catalog/components/list/ci_resources_list.vue | 74 +++ .../components/list/ci_resources_list_item.vue | 144 +++++ .../ci/catalog/components/list/empty_state.vue | 22 + .../components/pages/ci_resource_details_page.vue | 109 ++++ app/assets/javascripts/ci/catalog/constants.js | 35 ++ .../fragments/catalog_resource.fragment.graphql | 25 + ...et_ci_catalog_resource_components.query.graphql | 20 + .../get_ci_catalog_resource_details.query.graphql | 29 + .../get_ci_catalog_resource_readme.query.graphql | 6 + ...t_ci_catalog_resource_shared_data.query.graphql | 7 + .../javascripts/ci/catalog/graphql/settings.js | 32 ++ .../javascripts/ci/catalog/router/constants.js | 2 + app/assets/javascripts/ci/catalog/router/index.js | 13 + app/assets/javascripts/ci/catalog/router/routes.js | 9 + .../components/ci_environments_dropdown.vue | 43 +- .../components/ci_variable_drawer.vue | 368 +++++++------ .../components/ci_variable_modal.vue | 19 +- .../components/ci_variable_settings.vue | 10 +- .../components/ci_variable_shared.vue | 5 +- .../graphql/fragments/ci_variable.fragment.graphql | 1 - .../javascripts/ci/ci_variable_list/utils.js | 23 - .../javascripts/ci/common/pipelines_table.vue | 110 ++-- .../ci/common/private/job_action_component.vue | 2 +- app/assets/javascripts/ci/constants.js | 15 +- .../components/inherited_ci_variables_app.vue | 4 +- .../queries/inherited_ci_variables.query.graphql | 1 - .../ci/job_details/components/job_header.vue | 43 +- .../job_details/components/job_log_controllers.vue | 2 +- .../ci/job_details/components/log/line.vue | 8 +- .../ci/job_details/components/log/line_header.vue | 4 +- .../ci/job_details/components/log/line_number.vue | 5 +- .../components/manual_variables_form.vue | 8 +- .../components/sidebar/artifacts_block.vue | 14 +- .../components/sidebar/commit_block.vue | 6 +- .../ci/job_details/components/sidebar/sidebar.vue | 34 +- .../components/sidebar/sidebar_detail_row.vue | 4 +- .../components/sidebar/sidebar_header.vue | 141 ++--- .../sidebar/sidebar_job_details_container.vue | 6 - .../ci/job_details/components/stuck_block.vue | 2 +- .../graphql/fragments/ci_job.fragment.graphql | 1 - .../graphql/fragments/ci_variable.fragment.graphql | 1 - .../job_retry_with_variables.mutation.graphql | 2 +- app/assets/javascripts/ci/job_details/index.js | 32 +- app/assets/javascripts/ci/job_details/job_app.vue | 33 +- .../javascripts/ci/job_details/store/actions.js | 6 +- .../ci/job_details/store/mutation_types.js | 1 - .../javascripts/ci/job_details/store/mutations.js | 6 +- .../javascripts/ci/job_details/store/utils.js | 83 ++- .../components/job_cells/actions_cell.vue | 6 +- .../components/job_cells/duration_cell.vue | 52 -- .../ci/jobs_page/components/job_cells/job_cell.vue | 87 ++- .../components/job_cells/pipeline_cell.vue | 29 +- .../jobs_page/components/job_cells/status_cell.vue | 53 ++ .../ci/jobs_page/components/jobs_table.vue | 36 +- .../components/jobs_table_empty_state.vue | 1 + app/assets/javascripts/ci/jobs_page/constants.js | 15 +- .../graphql/mutations/job_retry.mutation.graphql | 2 +- .../mutations/retry_mr_failed_job.mutation.graphql | 2 +- .../javascripts/ci/pipeline_details/constants.js | 2 - .../javascripts/ci/pipeline_details/dag/dag.vue | 1 + .../graph/components/job_group_dropdown.vue | 4 +- .../pipeline_details/graph/components/job_item.vue | 17 +- .../graph/components/linked_pipeline.vue | 22 +- .../graph/components/stage_column_component.vue | 1 + .../graph/graph_component_wrapper.vue | 14 +- .../header/pipeline_details_header.vue | 248 ++++----- .../mutations/retry_failed_job.mutation.graphql | 2 +- .../ci/pipeline_details/mixins/pipelines_mixin.js | 11 +- .../ci/pipeline_details/pipelines_index.js | 30 +- .../components/header/pipeline_status.vue | 11 +- .../pipeline_mini_graph/legacy_pipeline_stage.vue | 17 +- .../linked_pipelines_mini_list.vue | 24 +- .../pipeline_new/components/pipeline_new_form.vue | 15 +- .../components/pipeline_schedules.vue | 85 ++- .../components/pipeline_schedules_form.vue | 26 +- .../javascripts/ci/pipeline_schedules/constants.js | 1 + .../queries/get_pipeline_schedules.query.graphql | 18 +- .../components/empty_state/no_ci_empty_state.vue | 1 + .../ci/pipelines_page/components/nav_controls.vue | 20 +- .../pipelines_page/components/pipeline_labels.vue | 33 +- .../components/pipeline_operations.vue | 59 +- .../components/pipeline_status_badge.vue | 37 ++ .../components/pipeline_stop_modal.vue | 31 +- .../ci/pipelines_page/components/pipeline_url.vue | 19 +- .../components/pipelines_manual_actions.vue | 3 +- .../components/pipelines_status_badge.vue | 51 -- .../javascripts/ci/pipelines_page/pipelines.vue | 81 ++- .../ci/runner/components/registration/utils.js | 45 +- .../ci/runner/components/runner_details.vue | 15 - .../ci/runner/components/runner_form_fields.vue | 10 +- .../ci/runner/components/runner_header.vue | 3 + .../ci/runner/components/runner_type_icon.vue | 62 +++ app/assets/javascripts/ci/runner/constants.js | 50 +- .../show/runner_details_shared.fragment.graphql | 4 - app/assets/javascripts/ci/runner/sentry_utils.js | 17 +- app/assets/javascripts/ci/utils.js | 16 +- .../clusters_list/components/agent_empty_state.vue | 6 +- .../components/clusters_empty_state.vue | 6 +- .../javascripts/clusters_list/store/actions.js | 7 +- .../comment_templates/components/form.vue | 2 +- .../pipelines/legacy_pipelines_table_wrapper.vue | 18 +- .../commit/pipelines/pipelines_bundle.js | 2 +- .../content_editor/components/content_editor.vue | 16 +- .../components/content_editor_provider.vue | 8 +- .../components/toolbar_attachment_button.vue | 2 +- .../components/toolbar_text_style_dropdown.vue | 2 +- .../content_editor/extensions/selection.js | 12 +- .../services/serialization_helpers.js | 9 +- ...ustomer_relations_organization.mutation.graphql | 10 + .../graphql/create_organization.mutation.graphql | 10 - .../components/organization_form_wrapper.vue | 4 +- .../javascripts/custom_emoji/components/app.vue | 2 +- .../deploy_tokens/components/new_deploy_token.vue | 2 +- .../design_description/description_form.vue | 3 - app/assets/javascripts/diffs/components/app.vue | 77 ++- .../diffs/components/compare_dropdown_layout.vue | 2 +- .../diffs/components/compare_versions.vue | 4 +- .../javascripts/diffs/components/diff_file.vue | 24 +- .../diffs/components/diff_file_header.vue | 17 +- .../javascripts/diffs/components/diff_row.vue | 2 - .../get_mr_codequality_reports.query.graphql | 46 ++ .../javascripts/diffs/components/tree_list.vue | 7 +- app/assets/javascripts/diffs/index.js | 5 + app/assets/javascripts/diffs/store/actions.js | 6 + .../javascripts/diffs/store/mutation_types.js | 1 + app/assets/javascripts/diffs/store/mutations.js | 5 + app/assets/javascripts/diffs/store/utils.js | 15 +- app/assets/javascripts/diffs/utils/diff_file.js | 1 + .../javascripts/diffs/utils/merge_request.js | 7 + .../diffs/utils/sort_findings_by_file.js | 17 + app/assets/javascripts/editor/schema/ci.json | 147 +++-- app/assets/javascripts/editor/source_editor.js | 5 +- app/assets/javascripts/emoji/awards_app/index.js | 8 +- app/assets/javascripts/emoji/components/picker.vue | 13 +- .../environments/components/canary_ingress.vue | 63 +-- .../environments/components/empty_state.vue | 6 +- .../environments/components/environment_form.vue | 11 +- .../components/kubernetes_overview.vue | 8 +- .../environments/components/kubernetes_pods.vue | 2 +- .../environments/components/kubernetes_summary.vue | 2 +- .../environments/components/kubernetes_tabs.vue | 4 +- .../components/new_environment_item.vue | 2 +- .../environment_details/deployments_table.vue | 7 +- .../environments/environment_details/index.vue | 8 +- .../graphql/queries/k8s_services.query.graphql | 4 +- .../environments/graphql/resolvers/flux.js | 4 +- .../environments/graphql/resolvers/kubernetes.js | 81 +-- .../components/error_tracking_list.vue | 6 +- .../feature_flags/components/empty_state.vue | 1 + .../components/strategies/flexible_rollout.vue | 2 +- .../components/strategies/percent_rollout.vue | 2 +- app/assets/javascripts/gfm_auto_complete.js | 50 +- .../databases/cloudsql/instance_table.vue | 1 + app/assets/javascripts/google_tag_manager/index.js | 311 +---------- .../client/is_showing_labels.query.graphql | 3 + .../client/set_is_showing_labels.mutation.graphql | 3 + .../javascripts/graphql_shared/issuable_client.js | 58 +- .../javascripts/graphql_shared/possible_types.json | 3 + .../queries/group_users_search.query.graphql | 15 +- .../empty_states/groups_dashboard_empty_state.vue | 1 + .../empty_states/groups_explore_empty_state.vue | 6 +- .../subgroups_and_projects_empty_state.vue | 1 + .../groups/components/group_name_and_path.vue | 6 +- .../groups/components/transfer_group_form.vue | 2 +- .../javascripts/helpers/startup_css_helper.js | 36 -- .../ide/components/new_dropdown/modal.vue | 1 - app/assets/javascripts/ide/init_gitlab_web_ide.js | 17 +- .../lib/gitlab_web_ide/handle_tracking_event.js | 2 +- app/assets/javascripts/import/constants.js | 4 +- .../import_entities/components/group_dropdown.vue | 72 --- .../components/import_target_dropdown.vue | 54 +- .../import_groups/components/import_table.vue | 15 +- .../components/import_target_cell.vue | 57 +- .../incidents/components/incidents_list.vue | 1 + app/assets/javascripts/integrations/constants.js | 8 + .../components/gitlab_slack_application.vue | 2 +- .../components/projects_dropdown.vue | 65 ++- .../components/invite_groups_modal.vue | 2 +- .../components/invite_members_modal.vue | 16 +- .../components/invite_modal_base.vue | 1 - .../issuable/components/hidden_badge.vue | 36 ++ .../issuable/components/locked_badge.vue | 36 ++ .../issuable/components/related_issuable_item.vue | 2 +- .../issuable/issuable_label_selector.js | 2 +- app/assets/javascripts/issues/constants.js | 2 +- .../issues/filtered_search_service_desk.js | 31 -- app/assets/javascripts/issues/index.js | 11 - .../components/empty_state_with_any_issues.vue | 4 + .../components/empty_state_without_any_issues.vue | 21 +- .../issues/list/components/issues_list_app.vue | 15 +- .../issues/list/queries/issue.fragment.graphql | 1 - .../components/empty_state_with_any_issues.vue | 1 + .../components/empty_state_without_any_issues.vue | 4 + .../service_desk/filtered_search_service_desk.js | 31 ++ .../javascripts/issues/service_desk/index.js | 11 + .../javascripts/issues/show/components/app.vue | 6 +- .../issues/show/components/delete_issue_modal.vue | 2 +- .../issues/show/components/description.vue | 18 +- .../issues/show/components/fields/description.vue | 4 +- .../javascripts/issues/show/components/form.vue | 15 - .../issues/show/components/header_actions.vue | 36 +- .../components/incidents/timeline_events_form.vue | 4 +- .../show/components/new_header_actions_popover.vue | 80 --- .../issues/show/components/sticky_header.vue | 45 +- app/assets/javascripts/issues/show/constants.js | 2 - app/assets/javascripts/issues/show/index.js | 4 +- .../jira_connect/branches/pages/index.vue | 1 + .../jira_connect/subscriptions/constants.js | 8 +- .../components/jira_import_progress.vue | 1 + .../jira_import/components/jira_import_setup.vue | 1 + app/assets/javascripts/labels/index.js | 4 +- app/assets/javascripts/labels/label_manager.js | 2 +- app/assets/javascripts/lazy_loader.js | 2 +- app/assets/javascripts/lib/utils/global_alerts.js | 37 ++ app/assets/javascripts/lib/utils/url_utility.js | 22 +- .../remove_member_dropdown_item.vue | 2 +- .../action_dropdowns/user_action_dropdown.vue | 1 - app/assets/javascripts/members/components/app.vue | 5 +- .../filter_sort/members_filtered_search_bar.vue | 3 +- .../members/components/members_tabs.vue | 3 +- app/assets/javascripts/merge_request_tabs.js | 16 +- .../merge_requests/components/compare_app.vue | 4 + .../merge_requests/components/compare_dropdown.vue | 1 - .../merge_requests/components/header_metadata.vue | 69 --- .../components/merge_request_header.vue | 113 ++++ .../components/merge_request_status_badge.vue | 74 --- .../merge_requests/components/sticky_header.vue | 33 +- app/assets/javascripts/merge_requests/index.js | 19 - .../show/components/candidate_detail_row.vue | 6 - .../routes/candidates/show/ml_candidates_show.vue | 167 ++++-- .../routes/candidates/show/translations.js | 7 +- .../index/components/ml_experiments_index.vue | 1 + .../experiments/show/ml_experiments_show.vue | 1 + .../javascripts/ml/model_registry/apps/index.js | 3 + .../ml/model_registry/apps/show_ml_model.vue | 16 + .../models/index/components/ml_models_index.vue | 27 +- .../routes/models/index/components/model_row.vue | 35 ++ .../routes/models/index/translations.js | 17 +- app/assets/javascripts/mr_notes/init_notes.js | 1 + .../javascripts/notes/components/comment_form.vue | 8 +- .../notes/components/comment_type_dropdown.vue | 5 +- .../notes/components/diff_with_note.vue | 9 +- .../notes/components/discussion_actions.vue | 3 +- .../notes/components/discussion_counter.vue | 7 +- .../notes/components/discussion_filter.vue | 4 +- .../notes/components/discussion_filter_note.vue | 2 +- .../components/email_participants_warning.vue | 7 +- .../notes/components/multiline_comment_form.vue | 2 +- .../javascripts/notes/components/note_actions.vue | 2 +- .../javascripts/notes/components/note_form.vue | 23 +- .../javascripts/notes/components/note_header.vue | 7 +- .../notes/components/noteable_discussion.vue | 2 +- .../javascripts/notes/components/noteable_note.vue | 2 +- .../notes/components/notes_activity_header.vue | 8 +- .../notes/components/toggle_replies_widget.vue | 9 +- app/assets/javascripts/notes/index.js | 1 + app/assets/javascripts/notes/stores/actions.js | 5 +- app/assets/javascripts/notes/stores/getters.js | 7 +- app/assets/javascripts/observability/client.js | 64 ++- .../observability/components/observability_app.vue | 87 --- .../components/observability_container.vue | 12 +- .../components/skeleton/dashboards.vue | 30 -- .../observability/components/skeleton/embed.vue | 16 - .../observability/components/skeleton/explore.vue | 28 - .../observability/components/skeleton/index.vue | 27 +- .../observability/components/skeleton/manage.vue | 26 - app/assets/javascripts/observability/constants.js | 28 - app/assets/javascripts/observability/index.js | 60 --- .../javascripts/observability/mock_traces.json | 107 ---- .../organizations/index/components/app.vue | 61 +++ .../index/components/organizations_list.vue | 26 + .../index/components/organizations_list_item.vue | 54 ++ .../index/components/organizations_view.vue | 52 ++ .../index/graphql/organizations.query.graphql | 14 + .../javascripts/organizations/index/index.js | 33 ++ app/assets/javascripts/organizations/mock_data.js | 40 +- .../organizations/new/components/app.vue | 82 +++ .../mutations/create_organization.mutation.graphql | 9 + .../organizations/new/graphql/typedefs.graphql | 5 + app/assets/javascripts/organizations/new/index.js | 35 ++ .../shared/components/new_edit_form.vue | 125 +++++ .../organizations/shared/graphql/resolvers.js | 36 +- .../explorer/components/details_page/tags_list.vue | 1 + .../components/list_page/group_empty_state.vue | 1 + .../components/list_page/project_empty_state.vue | 1 + .../container_registry/explorer/pages/details.vue | 1 + .../container_registry/explorer/pages/list.vue | 2 + .../components/manifests_empty_state.vue | 6 +- .../components/details/artifacts_list.vue | 1 + .../harbor_registry/components/tags/tags_list.vue | 1 + .../harbor_registry/pages/list.vue | 2 + .../details/components/app.vue | 1 + .../package_registry/pages/details.vue | 1 + .../settings/group/components/exceptions_input.vue | 2 +- .../general/components/signup_form.vue | 5 +- .../javascripts/pages/groups/custom_emoji/index.js | 3 + .../pages/groups/observability/dashboards/index.js | 3 - .../groups/observability/datasources/index.js | 3 - .../pages/groups/observability/explore/index.js | 3 - .../pages/groups/observability/manage/index.js | 3 - .../pages/groups/work_items/show/index.js | 4 + .../components/bulk_imports_history_app.vue | 50 +- .../organizations/organizations/index/index.js | 3 + .../pages/organizations/organizations/new/index.js | 3 + .../javascripts/pages/projects/blob/show/index.js | 2 + .../pages/projects/find_file/ref_switcher/index.js | 7 +- .../find_file/ref_switcher/ref_switcher_utils.js | 15 +- .../pages/projects/find_file/show/index.js | 3 +- .../pages/projects/graphs/charts/index.js | 373 +++++++------ .../pages/projects/issues/service_desk/index.js | 4 +- .../javascripts/pages/projects/jobs/show/index.js | 2 +- .../projects/merge_requests/creations/new/index.js | 1 + .../merge_requests/init_merge_request_show.js | 16 +- .../pages/projects/merge_requests/page.js | 4 +- .../pages/projects/ml/models/show/index.js | 4 + .../shared/components/interval_pattern_input.vue | 32 +- .../javascripts/pages/projects/show/index.js | 2 + .../javascripts/pages/projects/tree/show/index.js | 2 + .../javascripts/pages/projects/work_items/index.js | 2 +- .../javascripts/pages/registrations/new/index.js | 4 - .../shared/wikis/components/delete_wiki_modal.vue | 2 +- .../pages/shared/wikis/components/wiki_form.vue | 5 +- .../javascripts/pages/users/terms/index/index.js | 3 +- .../performance_bar/components/add_request.vue | 10 +- .../performance_bar/components/detailed_metric.vue | 30 +- .../components/performance_bar_app.vue | 194 +++---- .../components/request_selector.vue | 11 +- .../performance_bar/components/request_warning.vue | 21 +- .../info/components/commit_box_pipeline_status.vue | 17 +- .../projects/components/shared/delete_button.vue | 2 +- .../javascripts/projects/project_find_file.js | 11 +- .../projects/settings/api/access_dropdown_api.js | 16 +- .../settings/components/access_dropdown.vue | 4 +- .../settings/components/transfer_project_form.vue | 2 +- .../ref/components/ambiguous_ref_modal.vue | 80 +++ .../javascripts/ref/components/ref_selector.vue | 16 + app/assets/javascripts/ref/constants.js | 3 + .../javascripts/ref/init_ambiguous_ref_modal.js | 20 + .../components/add_issuable_form.vue | 2 +- .../components/related_issuable_input.vue | 2 +- .../components/related_issues_block.vue | 25 +- .../components/related_issues_list.vue | 4 +- .../releases/components/releases_empty_state.vue | 3 +- .../releases/components/tag_field_new.vue | 31 +- .../releases/stores/modules/edit_new/actions.js | 143 +++-- .../releases/stores/modules/edit_new/getters.js | 4 + .../stores/modules/edit_new/mutation_types.js | 1 + .../releases/stores/modules/edit_new/mutations.js | 3 + .../repository/components/blob_controls.vue | 6 + .../repository/components/breadcrumbs.vue | 3 +- .../repository/components/commit_info.vue | 116 ++++ .../repository/components/fork_info.vue | 2 +- .../repository/components/last_commit.vue | 150 ++---- .../repository/components/preview/index.vue | 2 +- .../repository/components/table/index.vue | 2 +- .../repository/components/table/row.vue | 2 +- app/assets/javascripts/repository/index.js | 15 +- .../repository/queries/blob_controls.query.graphql | 4 +- app/assets/javascripts/repository/router.js | 3 + .../javascripts/search/sidebar/components/app.vue | 24 +- .../sidebar/components/archived_filter/data.js | 9 +- .../sidebar/components/archived_filter/index.vue | 17 +- .../search/sidebar/components/issues_filters.vue | 5 +- .../sidebar/components/label_filter/index.vue | 2 +- .../sidebar/components/merge_requests_filters.vue | 7 +- .../sidebar/components/milestones_filters.vue | 18 + .../javascripts/search/sidebar/constants/index.js | 1 + app/assets/javascripts/search/store/constants.js | 4 + .../javascripts/search/topbar/components/app.vue | 26 +- app/assets/javascripts/search/topbar/constants.js | 3 +- app/assets/javascripts/search/topbar/index.js | 11 +- .../components/feature_card.vue | 7 +- app/assets/javascripts/sentry/init_sentry.js | 23 +- .../javascripts/sentry/sentry_browser_wrapper.js | 16 - app/assets/javascripts/settings_panels.js | 2 +- .../components/assignees/assignee_avatar.vue | 2 +- .../assignees/uncollapsed_assignee_list.vue | 2 - .../confidential/sidebar_confidentiality_form.vue | 4 +- .../sidebar_confidentiality_widget.vue | 1 + .../dropdown_contents_labels_view.vue | 2 +- .../labels_select_widget/dropdown_header.vue | 3 +- .../labels/labels_select_widget/dropdown_value.vue | 2 +- .../labels_select_widget/labels_select_root.vue | 1 - .../components/milestone/milestone_dropdown.vue | 2 +- .../components/reviewers/reviewer_title.vue | 2 +- .../sidebar/components/reviewers/reviewers.vue | 13 +- .../sidebar/components/sidebar_dropdown_widget.vue | 2 +- .../subscriptions/sidebar_subscriptions_widget.vue | 50 +- .../time_tracking/create_timelog_form.vue | 2 +- .../components/todo_toggle/sidebar_todo_widget.vue | 23 +- .../sidebar/components/todo_toggle/todo_button.vue | 2 +- app/assets/javascripts/sidebar/mount_sidebar.js | 17 - .../javascripts/snippets/components/edit.vue | 5 +- .../snippets/components/embed_dropdown.vue | 2 +- .../javascripts/snippets/components/show.vue | 4 +- .../components/snippet_blob_actions_edit.vue | 3 +- .../snippets/components/snippet_blob_edit.vue | 4 +- .../components/snippet_description_edit.vue | 4 +- .../components/snippet_description_view.vue | 2 +- .../snippets/components/snippet_header.vue | 7 +- .../snippets/components/snippet_title.vue | 2 +- .../components/snippet_visibility_edit.vue | 2 +- .../super_sidebar/components/brand_logo.vue | 4 +- .../super_sidebar/components/counter.vue | 2 +- .../super_sidebar/components/create_menu.vue | 4 +- .../global_search/components/global_search.vue | 3 + .../super_sidebar/components/help_center.vue | 2 +- .../super_sidebar/components/menu_section.vue | 18 +- .../super_sidebar/components/nav_item.vue | 26 +- .../super_sidebar/components/pinned_section.vue | 2 +- .../super_sidebar/components/sidebar_menu.vue | 14 +- .../super_sidebar/components/super_sidebar.vue | 17 +- .../components/super_sidebar_toggle.vue | 62 ++- .../super_sidebar/components/user_bar.vue | 11 +- .../super_sidebar/components/user_menu.vue | 9 +- .../components/user_menu_profile_item.vue | 83 +++ .../super_sidebar/components/user_name_group.vue | 91 ---- app/assets/javascripts/super_sidebar/constants.js | 2 +- app/assets/javascripts/super_sidebar/event_hub.js | 3 + .../super_sidebar/super_sidebar_bundle.js | 4 + app/assets/javascripts/super_sidebar/utils.js | 22 +- app/assets/javascripts/terms/components/app.vue | 2 +- .../terraform/components/empty_state.vue | 5 +- .../components/inbound_token_access.vue | 2 +- app/assets/javascripts/tracking/constants.js | 1 - app/assets/javascripts/tracking/internal_events.js | 35 +- .../components/action_buttons.vue | 10 +- .../components/approvals/approvals.vue | 6 +- .../components/checks/conflicts.vue | 77 +++ .../components/checks/message.vue | 44 ++ .../components/deployment/deployment.vue | 2 +- .../components/merge_checks.stories.js | 91 ++++ .../components/merge_checks.vue | 129 +++++ .../components/mr_widget_pipeline.vue | 25 +- .../components/state_container.vue | 20 +- .../states/mr_widget_auto_merge_enabled.vue | 1 - .../states/mr_widget_failed_to_merge.vue | 1 - .../components/states/mr_widget_merged.vue | 8 +- .../components/states/mr_widget_rebase.vue | 2 - .../components/states/ready_to_merge.vue | 5 +- .../components/states/sha_mismatch.vue | 2 +- .../components/states/squash_before_merge.vue | 2 +- .../components/widget/action_buttons.vue | 72 +-- .../javascripts/vue_merge_request_widget/index.js | 4 + .../vue_merge_request_widget/mr_widget_options.vue | 6 +- .../queries/merge_checks.query.graphql | 12 + .../queries/states/conflicts.query.graphql | 3 + .../stores/mr_widget_store.js | 2 +- .../alert_details/components/alert_status.vue | 53 +- .../components/sidebar/sidebar_status.vue | 5 +- .../vue_shared/components/badges/beta_badge.vue | 35 +- .../components/badges/experiment_badge.stories.js | 24 + .../components/badges/experiment_badge.vue | 43 ++ .../vue_shared/components/badges/hover_badge.vue | 52 ++ .../components/blob_viewers/rich_viewer.vue | 12 +- .../vue_shared/components/ci_badge_link.vue | 21 +- .../components/clone_dropdown/clone_dropdown.vue | 4 +- .../clone_dropdown/clone_dropdown_item.vue | 4 +- .../dropdown/dropdown_widget/dropdown_widget.vue | 2 +- .../filtered_search_bar/tokens/base_token.vue | 1 + .../filtered_search_bar/tokens/user_token.vue | 18 +- .../form/input_copy_toggle_visibility.vue | 4 +- .../components/incubation/pagination.vue | 1 + .../components/markdown/apply_suggestion.vue | 6 +- .../markdown/comment_templates_dropdown.vue | 4 +- .../components/markdown/editor_mode_switcher.vue | 99 +--- .../vue_shared/components/markdown/field.vue | 7 +- .../vue_shared/components/markdown/header.vue | 6 +- .../components/markdown/markdown_editor.vue | 13 +- .../components/markdown/mount_markdown_editor.js | 1 - .../components/markdown/suggestion_diff_header.vue | 6 +- .../vue_shared/components/markdown/toolbar.vue | 22 +- .../vue_shared/components/markdown/utils.js | 7 - .../vue_shared/components/mr_more_dropdown.vue | 16 +- .../vue_shared/components/notes/skeleton_note.vue | 2 +- .../instructions/runner_cli_instructions.vue | 35 +- .../components/segmented_control_button_group.vue | 16 + .../source_viewer/components/blame_info.vue | 51 ++ .../components/source_viewer/source_viewer.vue | 2 +- .../vue_shared/components/source_viewer/utils.js | 37 ++ .../vue_shared/components/time_ago_tooltip.vue | 20 +- .../vue_shared/components/toggle_labels.vue | 62 +++ .../vue_shared/components/vuex_module_provider.vue | 7 +- .../vue_shared/components/web_ide_link.vue | 2 +- app/assets/javascripts/vue_shared/constants.js | 3 + .../vue_shared/global_search/constants.js | 1 + .../create/components/issuable_create_root.vue | 5 + .../issuable/create/components/issuable_form.vue | 32 +- .../issuable/list/components/issuable_item.vue | 43 +- .../issuable/show/components/issuable_header.vue | 32 +- .../new_namespace/new_namespace_page.vue | 5 +- .../components/notes/work_item_add_note.vue | 16 +- .../components/notes/work_item_comment_form.vue | 1 - .../components/notes/work_item_discussion.vue | 9 +- .../work_items/components/notes/work_item_note.vue | 27 +- .../components/notes/work_item_note_actions.vue | 5 +- .../notes/work_item_note_awards_list.vue | 5 +- .../shared/work_item_link_child_contents.vue | 20 +- .../shared/work_item_link_child_metadata.vue | 1 + .../components/shared/work_item_token_input.vue | 26 +- .../work_items/components/work_item_actions.vue | 89 +--- .../work_items/components/work_item_assignees.vue | 11 +- .../components/work_item_attributes_wrapper.vue | 35 +- .../components/work_item_created_updated.vue | 15 +- .../components/work_item_description.vue | 11 +- .../work_items/components/work_item_detail.vue | 34 +- .../work_items/components/work_item_labels.vue | 11 +- .../work_item_links/work_item_children_wrapper.vue | 29 +- .../work_item_links/work_item_link_child.vue | 6 - .../components/work_item_links/work_item_links.vue | 17 +- .../work_item_links/work_item_links_form.vue | 15 +- .../components/work_item_links/work_item_tree.vue | 7 +- .../work_item_links/work_item_tree_children.vue | 1 - .../work_items/components/work_item_milestone.vue | 5 +- .../work_items/components/work_item_notes.vue | 6 +- .../work_items/components/work_item_parent.vue | 249 +++++++++ .../work_item_add_relationship_form.vue | 249 +++++++++ .../work_item_relationship_list.vue | 15 +- .../work_item_relationships.vue | 142 ++++- .../work_items/components/work_item_todos.vue | 10 +- .../work_items/components/work_item_type_icon.vue | 5 + app/assets/javascripts/work_items/constants.js | 28 +- .../graphql/add_linked_items.mutation.graphql | 10 + .../javascripts/work_items/graphql/cache_utils.js | 15 +- .../graphql/group_work_item_by_iid.query.graphql | 12 + .../graphql/project_work_items.query.graphql | 1 + .../graphql/remove_linked_items.mutation.graphql | 6 + ...update_work_item_notifications.mutation.graphql | 15 +- .../work_items/graphql/work_item.fragment.graphql | 1 + .../work_item_metadata_widgets.fragment.graphql | 8 + .../graphql/work_item_tree.query.graphql | 1 + .../graphql/work_item_widgets.fragment.graphql | 2 + app/assets/javascripts/work_items/index.js | 19 +- .../work_items/pages/create_work_item.vue | 5 +- app/assets/javascripts/work_items/utils.js | 5 - app/assets/stylesheets/_page_specific_files.scss | 2 - app/assets/stylesheets/components/detail_page.scss | 4 - .../stylesheets/components/related_items_list.scss | 1 - app/assets/stylesheets/fonts.scss | 8 +- app/assets/stylesheets/framework/blocks.scss | 4 + app/assets/stylesheets/framework/common.scss | 47 +- app/assets/stylesheets/framework/emojis.scss | 3 +- app/assets/stylesheets/framework/mixins.scss | 2 +- app/assets/stylesheets/framework/sidebar.scss | 14 +- app/assets/stylesheets/framework/variables.scss | 4 +- app/assets/stylesheets/page_bundles/build.scss | 17 +- .../page_bundles/escalation_policies.scss | 6 + app/assets/stylesheets/page_bundles/ide.scss | 2 +- app/assets/stylesheets/page_bundles/issuable.scss | 13 - app/assets/stylesheets/page_bundles/labels.scss | 192 +++++++ .../stylesheets/page_bundles/merge_request.scss | 6 +- .../page_bundles/ml_experiment_tracking.scss | 2 +- .../stylesheets/page_bundles/organizations.scss | 10 + app/assets/stylesheets/page_bundles/projects.scss | 591 +++++++++++++++++++++ .../stylesheets/page_bundles/work_items.scss | 29 + app/assets/stylesheets/pages/labels.scss | 212 -------- app/assets/stylesheets/pages/projects.scss | 589 -------------------- app/assets/stylesheets/performance_bar.scss | 35 +- .../stylesheets/themes/dark_mode_overrides.scss | 14 +- app/assets/stylesheets/utilities.scss | 4 + 638 files changed, 9580 insertions(+), 5888 deletions(-) delete mode 100644 app/assets/images/callouts/rich_text_editor_illustration.svg delete mode 100644 app/assets/images/jobs-empty-state.svg create mode 100644 app/assets/javascripts/analytics/shared/components/date_ranges_dropdown.vue create mode 100644 app/assets/javascripts/behaviors/components/global_alerts.vue create mode 100644 app/assets/javascripts/behaviors/global_alerts.js delete mode 100644 app/assets/javascripts/behaviors/markdown/render_observability.js create mode 100644 app/assets/javascripts/blob/csv/constants.js create mode 100644 app/assets/javascripts/boards/graphql/client/selected_board_items.query.graphql create mode 100644 app/assets/javascripts/boards/graphql/client/set_selected_board_items.mutation.graphql create mode 100644 app/assets/javascripts/boards/graphql/client/unset_selected_board_items.mutation.graphql create mode 100644 app/assets/javascripts/ci/catalog/components/ci_catalog_home.vue create mode 100644 app/assets/javascripts/ci/catalog/components/details/ci_resource_about.vue create mode 100644 app/assets/javascripts/ci/catalog/components/details/ci_resource_components.vue create mode 100644 app/assets/javascripts/ci/catalog/components/details/ci_resource_details.vue create mode 100644 app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue create mode 100644 app/assets/javascripts/ci/catalog/components/details/ci_resource_header_skeleton_loader.vue create mode 100644 app/assets/javascripts/ci/catalog/components/details/ci_resource_readme.vue create mode 100644 app/assets/javascripts/ci/catalog/components/list/catalog_header.vue create mode 100644 app/assets/javascripts/ci/catalog/components/list/catalog_list_skeleton_loader.vue create mode 100644 app/assets/javascripts/ci/catalog/components/list/ci_resources_list.vue create mode 100644 app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue create mode 100644 app/assets/javascripts/ci/catalog/components/list/empty_state.vue create mode 100644 app/assets/javascripts/ci/catalog/components/pages/ci_resource_details_page.vue create mode 100644 app/assets/javascripts/ci/catalog/constants.js create mode 100644 app/assets/javascripts/ci/catalog/graphql/fragments/catalog_resource.fragment.graphql create mode 100644 app/assets/javascripts/ci/catalog/graphql/queries/get_ci_catalog_resource_components.query.graphql create mode 100644 app/assets/javascripts/ci/catalog/graphql/queries/get_ci_catalog_resource_details.query.graphql create mode 100644 app/assets/javascripts/ci/catalog/graphql/queries/get_ci_catalog_resource_readme.query.graphql create mode 100644 app/assets/javascripts/ci/catalog/graphql/queries/get_ci_catalog_resource_shared_data.query.graphql create mode 100644 app/assets/javascripts/ci/catalog/graphql/settings.js create mode 100644 app/assets/javascripts/ci/catalog/router/constants.js create mode 100644 app/assets/javascripts/ci/catalog/router/index.js create mode 100644 app/assets/javascripts/ci/catalog/router/routes.js delete mode 100644 app/assets/javascripts/ci/jobs_page/components/job_cells/duration_cell.vue create mode 100644 app/assets/javascripts/ci/jobs_page/components/job_cells/status_cell.vue create mode 100644 app/assets/javascripts/ci/pipelines_page/components/pipeline_status_badge.vue delete mode 100644 app/assets/javascripts/ci/pipelines_page/components/pipelines_status_badge.vue create mode 100644 app/assets/javascripts/ci/runner/components/runner_type_icon.vue create mode 100644 app/assets/javascripts/crm/organizations/components/graphql/create_customer_relations_organization.mutation.graphql delete mode 100644 app/assets/javascripts/crm/organizations/components/graphql/create_organization.mutation.graphql create mode 100644 app/assets/javascripts/diffs/components/graphql/get_mr_codequality_reports.query.graphql create mode 100644 app/assets/javascripts/diffs/utils/sort_findings_by_file.js create mode 100644 app/assets/javascripts/graphql_shared/client/is_showing_labels.query.graphql create mode 100644 app/assets/javascripts/graphql_shared/client/set_is_showing_labels.mutation.graphql delete mode 100644 app/assets/javascripts/helpers/startup_css_helper.js delete mode 100644 app/assets/javascripts/import_entities/components/group_dropdown.vue create mode 100644 app/assets/javascripts/issuable/components/hidden_badge.vue create mode 100644 app/assets/javascripts/issuable/components/locked_badge.vue delete mode 100644 app/assets/javascripts/issues/filtered_search_service_desk.js create mode 100644 app/assets/javascripts/issues/service_desk/filtered_search_service_desk.js delete mode 100644 app/assets/javascripts/issues/show/components/new_header_actions_popover.vue create mode 100644 app/assets/javascripts/lib/utils/global_alerts.js delete mode 100644 app/assets/javascripts/merge_requests/components/header_metadata.vue create mode 100644 app/assets/javascripts/merge_requests/components/merge_request_header.vue delete mode 100644 app/assets/javascripts/merge_requests/components/merge_request_status_badge.vue delete mode 100644 app/assets/javascripts/merge_requests/index.js create mode 100644 app/assets/javascripts/ml/model_registry/apps/index.js create mode 100644 app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue create mode 100644 app/assets/javascripts/ml/model_registry/routes/models/index/components/model_row.vue delete mode 100644 app/assets/javascripts/observability/components/observability_app.vue delete mode 100644 app/assets/javascripts/observability/components/skeleton/dashboards.vue delete mode 100644 app/assets/javascripts/observability/components/skeleton/embed.vue delete mode 100644 app/assets/javascripts/observability/components/skeleton/explore.vue delete mode 100644 app/assets/javascripts/observability/components/skeleton/manage.vue delete mode 100644 app/assets/javascripts/observability/index.js delete mode 100644 app/assets/javascripts/observability/mock_traces.json create mode 100644 app/assets/javascripts/organizations/index/components/app.vue create mode 100644 app/assets/javascripts/organizations/index/components/organizations_list.vue create mode 100644 app/assets/javascripts/organizations/index/components/organizations_list_item.vue create mode 100644 app/assets/javascripts/organizations/index/components/organizations_view.vue create mode 100644 app/assets/javascripts/organizations/index/graphql/organizations.query.graphql create mode 100644 app/assets/javascripts/organizations/index/index.js create mode 100644 app/assets/javascripts/organizations/new/components/app.vue create mode 100644 app/assets/javascripts/organizations/new/graphql/mutations/create_organization.mutation.graphql create mode 100644 app/assets/javascripts/organizations/new/graphql/typedefs.graphql create mode 100644 app/assets/javascripts/organizations/new/index.js create mode 100644 app/assets/javascripts/organizations/shared/components/new_edit_form.vue create mode 100644 app/assets/javascripts/pages/groups/custom_emoji/index.js delete mode 100644 app/assets/javascripts/pages/groups/observability/dashboards/index.js delete mode 100644 app/assets/javascripts/pages/groups/observability/datasources/index.js delete mode 100644 app/assets/javascripts/pages/groups/observability/explore/index.js delete mode 100644 app/assets/javascripts/pages/groups/observability/manage/index.js create mode 100644 app/assets/javascripts/pages/groups/work_items/show/index.js create mode 100644 app/assets/javascripts/pages/organizations/organizations/index/index.js create mode 100644 app/assets/javascripts/pages/organizations/organizations/new/index.js create mode 100644 app/assets/javascripts/pages/projects/ml/models/show/index.js create mode 100644 app/assets/javascripts/ref/components/ambiguous_ref_modal.vue create mode 100644 app/assets/javascripts/ref/init_ambiguous_ref_modal.js create mode 100644 app/assets/javascripts/repository/components/commit_info.vue create mode 100644 app/assets/javascripts/search/sidebar/components/milestones_filters.vue create mode 100644 app/assets/javascripts/super_sidebar/components/user_menu_profile_item.vue delete mode 100644 app/assets/javascripts/super_sidebar/components/user_name_group.vue create mode 100644 app/assets/javascripts/super_sidebar/event_hub.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/checks/conflicts.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/checks/message.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/merge_checks.stories.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/queries/merge_checks.query.graphql create mode 100644 app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js create mode 100644 app/assets/javascripts/vue_shared/components/badges/experiment_badge.vue create mode 100644 app/assets/javascripts/vue_shared/components/badges/hover_badge.vue delete mode 100644 app/assets/javascripts/vue_shared/components/markdown/utils.js create mode 100644 app/assets/javascripts/vue_shared/components/source_viewer/components/blame_info.vue create mode 100644 app/assets/javascripts/vue_shared/components/source_viewer/utils.js create mode 100644 app/assets/javascripts/vue_shared/components/toggle_labels.vue create mode 100644 app/assets/javascripts/work_items/components/work_item_parent.vue create mode 100644 app/assets/javascripts/work_items/components/work_item_relationships/work_item_add_relationship_form.vue create mode 100644 app/assets/javascripts/work_items/graphql/add_linked_items.mutation.graphql create mode 100644 app/assets/javascripts/work_items/graphql/group_work_item_by_iid.query.graphql create mode 100644 app/assets/javascripts/work_items/graphql/remove_linked_items.mutation.graphql create mode 100644 app/assets/stylesheets/page_bundles/labels.scss create mode 100644 app/assets/stylesheets/page_bundles/organizations.scss create mode 100644 app/assets/stylesheets/page_bundles/projects.scss delete mode 100644 app/assets/stylesheets/pages/labels.scss delete mode 100644 app/assets/stylesheets/pages/projects.scss (limited to 'app/assets') diff --git a/app/assets/images/callouts/rich_text_editor_illustration.svg b/app/assets/images/callouts/rich_text_editor_illustration.svg deleted file mode 100644 index b07d8871fe6..00000000000 --- a/app/assets/images/callouts/rich_text_editor_illustration.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/jobs-empty-state.svg b/app/assets/images/jobs-empty-state.svg deleted file mode 100644 index e6e0681a002..00000000000 --- a/app/assets/images/jobs-empty-state.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/javascripts/admin/abuse_report/components/report_actions.vue b/app/assets/javascripts/admin/abuse_report/components/report_actions.vue index 560d733c10c..e005e183c9f 100644 --- a/app/assets/javascripts/admin/abuse_report/components/report_actions.vue +++ b/app/assets/javascripts/admin/abuse_report/components/report_actions.vue @@ -14,8 +14,10 @@ import { DRAWER_Z_INDEX } from '~/lib/utils/constants'; import { ACTIONS_I18N, NO_ACTION, + TRUST_ACTION, USER_ACTION_OPTIONS, REASON_OPTIONS, + TRUST_REASON, STATUS_OPEN, SUCCESS_ALERT, FAILED_ALERT, @@ -77,6 +79,16 @@ export default { userActionOptions() { return this.isNotCurrentUser ? USER_ACTION_OPTIONS : [NO_ACTION]; }, + reasonOptions() { + if (!this.isNotCurrentUser) { + return []; + } + + if (this.form.user_action === TRUST_ACTION.value) { + return [TRUST_REASON]; + } + return REASON_OPTIONS; + }, }, methods: { toggleActionsDrawer() { @@ -120,7 +132,6 @@ export default { }, }, i18n: ACTIONS_I18N, - reasonOptions: REASON_OPTIONS, DRAWER_Z_INDEX, }; @@ -173,7 +184,7 @@ export default { id="reason" v-model="form.reason" data-testid="reason-select" - :options="$options.reasonOptions" + :options="reasonOptions" :state="validationState.reason" @change="validateReason" /> diff --git a/app/assets/javascripts/admin/abuse_report/components/user_details.vue b/app/assets/javascripts/admin/abuse_report/components/user_details.vue index fe0add1ba8d..0c32341652b 100644 --- a/app/assets/javascripts/admin/abuse_report/components/user_details.vue +++ b/app/assets/javascripts/admin/abuse_report/components/user_details.vue @@ -60,9 +60,6 @@ export default { data-testid="credit-card-verification" :label="$options.i18n.creditCard" > - - -