From 5e396cd53ef1686fbc02b446a6a44d8a69ce8755 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Feb 2023 00:08:01 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../javascripts/integrations/constants.js | 2 +- .../index/components/integrations_table.vue | 14 +- .../issues/show/components/app.vue | 6 - .../issues/show/components/description.vue | 15 +- app/assets/javascripts/issues/show/index.js | 1 - .../javascripts/pages/profiles/index.js | 2 + .../pages/registrations/new/index.js | 2 +- .../javascripts/pages/sessions/new/index.js | 2 +- .../new => validators}/length_validator.js | 15 +- .../components/work_item_links/index.js | 2 - .../work_item_links/work_item_links.vue | 11 +- .../graphql/get_issue_details.query.graphql | 11 +- .../admin/ci/variables_controller.rb | 2 +- .../groups/variables_controller.rb | 2 +- .../projects/ci/lints_controller.rb | 2 +- .../projects/ci/pipeline_editor_controller.rb | 2 +- .../histograms_controller.rb | 2 +- .../projects/variables_controller.rb | 2 +- app/views/profiles/show.html.haml | 13 +- .../issues/_work_item_links.html.haml | 2 +- ...083_projects_settings_cicd_show_render.yml | 2 +- ...352_projects_settings_cicd_show_upload.yml | 2 +- ...364_projects_settings_cicd_show_delete.yml | 2 +- .../1674843937_Ci__Build_create_id_tokens.yml | 2 +- config/feature_categories.yml | 5 +- db/docs/ci_build_needs.yml | 2 +- db/docs/ci_group_variables.yml | 2 +- db/docs/ci_instance_variables.yml | 2 +- db/docs/ci_job_variables.yml | 2 +- db/docs/ci_pipeline_variables.yml | 2 +- db/docs/ci_secure_file_states.yml | 2 +- db/docs/ci_secure_files.yml | 2 +- db/docs/ci_sources_pipelines.yml | 2 +- db/docs/ci_variables.yml | 2 +- .../raketasks/project_import_export.md | 146 +++++++++++++----- doc/administration/repository_checks.md | 35 ++++- .../img/environments_project_home.png | Bin 70687 -> 23937 bytes .../testing/img/code_quality_summary_15_9.png | Bin 369601 -> 71968 bytes doc/development/img/feature-flag-metrics.png | Bin 88110 -> 27814 bytes doc/development/import_project.md | 119 -------------- doc/operations/img/copy-group-id.png | Bin 112686 -> 22172 bytes .../img/create-gitlab-application.png | Bin 521206 -> 162624 bytes doc/operations/img/listing_groups.png | Bin 40621 -> 15444 bytes doc/raketasks/index.md | 2 +- doc/update/index.md | 2 + .../img/Azure-manage-group-claims.png | Bin 84609 -> 24492 bytes doc/user/project/settings/import_export.md | 2 +- lib/api/admin/ci/variables.rb | 2 +- lib/api/ci/pipelines.rb | 4 +- lib/api/ci/variables.rb | 2 +- lib/api/group_variables.rb | 2 +- lib/api/lint.rb | 2 +- lib/api/templates.rb | 2 +- lib/gitlab/etag_caching/router/graphql.rb | 2 +- locale/gitlab.pot | 8 +- spec/commands/sidekiq_cluster/cli_spec.rb | 5 +- spec/features/admin_variables_spec.rb | 2 +- spec/features/group_variables_spec.rb | 2 +- ...late_new_pipeline_vars_with_params_spec.rb | 2 +- .../profiles/user_edit_profile_spec.rb | 20 +++ spec/features/project_group_variables_spec.rb | 2 +- spec/features/project_variables_spec.rb | 2 +- spec/features/projects/ci/editor_spec.rb | 2 +- spec/features/projects/ci/lint_spec.rb | 2 +- ...user_activates_slack_notifications_spec.rb | 1 - .../components/integrations_table_spec.js | 57 +------ .../issues/show/components/app_spec.js | 1 - .../show/components/description_spec.js | 7 +- .../validators/length_validator_spec.js | 91 +++++++++++ .../work_item_links/work_item_links_spec.js | 1 - spec/frontend/work_items/mock_data.js | 27 ++-- .../resolvers/ci/variables_resolver_spec.rb | 2 +- .../types/ci/variable_sort_enum_spec.rb | 2 +- spec/helpers/ci/variables_helper_spec.rb | 2 +- spec/lib/atlassian/jira_connect_spec.rb | 2 +- spec/lib/gitlab/background_task_spec.rb | 4 +- spec/lib/gitlab/changes_list_spec.rb | 2 +- spec/lib/gitlab/ci/build/auto_retry_spec.rb | 2 +- .../lib/gitlab/ci/build/context/build_spec.rb | 2 +- spec/lib/gitlab/ci/build/hook_spec.rb | 2 +- .../ci/components/instance_path_spec.rb | 2 +- spec/lib/gitlab/ci/config/entry/job_spec.rb | 2 +- .../lib/gitlab/ci/config/entry/policy_spec.rb | 4 +- .../ci/config/entry/processable_spec.rb | 2 +- .../ci/config/entry/pull_policy_spec.rb | 4 +- .../entry/reports/coverage_report_spec.rb | 2 +- .../gitlab/ci/config/entry/reports_spec.rb | 2 +- .../gitlab/ci/config/entry/trigger_spec.rb | 2 +- .../gitlab/ci/config/external/context_spec.rb | 2 +- .../ci/config/external/file/artifact_spec.rb | 2 +- .../ci/config/external/file/base_spec.rb | 2 +- .../ci/config/external/file/component_spec.rb | 2 +- .../ci/config/external/file/local_spec.rb | 2 +- .../ci/config/external/file/project_spec.rb | 2 +- .../ci/config/external/file/remote_spec.rb | 2 +- .../ci/config/external/file/template_spec.rb | 2 +- .../ci/config/external/mapper/base_spec.rb | 2 +- .../ci/config/external/mapper/filter_spec.rb | 2 +- .../external/mapper/location_expander_spec.rb | 2 +- .../ci/config/external/mapper/matcher_spec.rb | 2 +- .../config/external/mapper/normalizer_spec.rb | 2 +- .../mapper/variables_expander_spec.rb | 2 +- .../config/external/mapper/verifier_spec.rb | 2 +- .../gitlab/ci/config/external/mapper_spec.rb | 2 +- .../ci/config/external/processor_spec.rb | 2 +- .../gitlab/ci/config/external/rules_spec.rb | 2 +- .../lib/gitlab/ci/config/header/input_spec.rb | 2 +- spec/lib/gitlab/ci/config/header/root_spec.rb | 2 +- spec/lib/gitlab/ci/config/header/spec_spec.rb | 2 +- spec/lib/gitlab/ci/config/yaml_spec.rb | 2 +- spec/lib/gitlab/ci/config_spec.rb | 2 +- .../gitlab/ci/interpolation/access_spec.rb | 2 +- .../lib/gitlab/ci/interpolation/block_spec.rb | 2 +- .../gitlab/ci/interpolation/config_spec.rb | 2 +- .../gitlab/ci/interpolation/context_spec.rb | 2 +- .../gitlab/ci/interpolation/template_spec.rb | 2 +- spec/lib/gitlab/ci/lint_spec.rb | 2 +- .../lib/gitlab/ci/pipeline/seed/build_spec.rb | 2 +- .../lib/gitlab/ci/pipeline/seed/stage_spec.rb | 2 +- .../ci/variables/builder/pipeline_spec.rb | 2 +- spec/lib/gitlab/ci/variables/builder_spec.rb | 2 +- .../gitlab/ci/variables/collection_spec.rb | 2 +- spec/lib/gitlab/ci/yaml_processor_spec.rb | 2 +- .../gitlab/config/entry/validators_spec.rb | 2 +- .../config/loader/multi_doc_yaml_spec.rb | 2 +- spec/lib/gitlab/config/loader/yaml_spec.rb | 2 +- spec/lib/gitlab/console_spec.rb | 4 +- spec/lib/gitlab/endpoint_attributes_spec.rb | 7 +- .../import_export/json/legacy_writer_spec.rb | 3 +- .../watchdog/monitor/rss_memory_limit_spec.rb | 3 +- .../gitlab/metrics/boot_time_tracker_spec.rb | 4 +- spec/lib/gitlab/net_http_adapter_spec.rb | 3 +- .../sanitizers/exception_message_spec.rb | 3 +- ...ns_and_triggers_for_ci_build_needs_spec.rb | 2 +- ...t4_column_for_ci_sources_pipelines_spec.rb | 2 +- spec/models/ci/group_variable_spec.rb | 2 +- spec/models/ci/variable_spec.rb | 2 +- spec/models/concerns/ci/maskable_spec.rb | 2 +- spec/requests/api/ci/variables_spec.rb | 2 +- .../api/graphql/ci/config_variables_spec.rb | 2 +- .../api/graphql/ci/group_variables_spec.rb | 2 +- .../api/graphql/ci/instance_variables_spec.rb | 2 +- .../api/graphql/ci/manual_variables_spec.rb | 2 +- .../api/graphql/ci/project_variables_spec.rb | 2 +- spec/requests/api/group_variables_spec.rb | 2 +- spec/requests/api/lint_spec.rb | 2 +- .../histograms_controller_spec.rb | 2 +- spec/scripts/lib/glfm/shared_spec.rb | 3 +- .../ci/components/fetch_service_spec.rb | 2 +- .../create_pipeline_service/include_spec.rb | 2 +- .../ci/create_pipeline_service/rules_spec.rb | 2 +- .../ci/list_config_variables_service_spec.rb | 2 +- .../integrations/integration_settings_form.rb | 1 - .../projects/pipelines/show.html.haml_spec.rb | 2 +- 154 files changed, 450 insertions(+), 430 deletions(-) rename app/assets/javascripts/{pages/sessions/new => validators}/length_validator.js (67%) create mode 100644 spec/frontend/validators/length_validator_spec.js diff --git a/app/assets/javascripts/integrations/constants.js b/app/assets/javascripts/integrations/constants.js index 5d08520bb5c..55576f6e9f9 100644 --- a/app/assets/javascripts/integrations/constants.js +++ b/app/assets/javascripts/integrations/constants.js @@ -90,7 +90,7 @@ export const billingPlanNames = { [billingPlans.ULTIMATE]: s__('BillingPlans|Ultimate'), }; -export const INTEGRATION_TYPE_SLACK = 'slack'; +const INTEGRATION_TYPE_SLACK = 'slack'; const INTEGRATION_TYPE_SLACK_APPLICATION = 'gitlab_slack_application'; const INTEGRATION_TYPE_MATTERMOST = 'mattermost'; diff --git a/app/assets/javascripts/integrations/index/components/integrations_table.vue b/app/assets/javascripts/integrations/index/components/integrations_table.vue index 62f0fe4d6bf..439c243f418 100644 --- a/app/assets/javascripts/integrations/index/components/integrations_table.vue +++ b/app/assets/javascripts/integrations/index/components/integrations_table.vue @@ -1,9 +1,7 @@