From b330f7f0bfb2035b03e84e5fa751816b6ad9b841 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 11 Jan 2022 18:16:38 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/docs.gitlab-ci.yml | 5 +- .gitlab/ci/rules.gitlab-ci.yml | 13 +- .rubocop_todo/graphql/field_method.yml | 4 - Gemfile | 1 + Gemfile.lock | 5 + app/assets/javascripts/behaviors/copy_code.js | 2 +- .../javascripts/clusters_list/constants.js | 2 +- .../components/wrappers/frontmatter.vue | 2 +- .../extensions/code_block_highlight.js | 9 +- .../components/details/app.vue | 24 +- .../details/composer_installation.vue | 4 +- .../components/details/conan_installation.vue | 3 +- .../components/details/maven_installation.vue | 14 +- .../components/details/npm_installation.vue | 4 +- .../components/details/nuget_installation.vue | 3 +- .../components/details/package_files.vue | 6 +- .../components/details/pypi_installation.vue | 5 +- .../queries/get_package_details.query.graphql | 10 + .../components/extensions/base.vue | 50 ++- .../components/extensions/index.js | 1 + .../extensions/terraform/index.js | 39 +- .../projects/merge_requests_controller.rb | 4 - app/helpers/notes_helper.rb | 2 +- app/models/project.rb | 1 + app/models/project_setting.rb | 10 + ...ntainer_registry_authentication_service.rb | 10 +- app/services/projects/destroy_service.rb | 2 + app/services/projects/fork_service.rb | 6 + app/views/notify/_note_email.html.haml | 6 +- .../notify/repository_push_email.html.haml | 2 +- .../projects/diffs/_email_line.html.haml | 21 + app/views/projects/diffs/_line.html.haml | 2 + app/views/projects/diffs/_text_file.html.haml | 36 +- .../container_registry_cdn_redirect.yml | 8 + ...ate_deployment_in_separate_transaction.yml | 2 +- .../development/dast_api_scanner.yml | 8 + ...ml => inline_haml_diff_line_rendering.yml} | 10 +- .../use_typhoeus_elasticsearch_adapter.yml | 8 + .../templates/_deprecation_template.md.erb | 7 +- data/removals/14_0/14_0-ds-deprecations.yml | 10 + data/removals/14_0/14_0-lc-deprecations.yml | 6 + .../change_default_branch_name_to_main.yml | 10 + .../14_0/create-code-review-draft-wip.yml | 6 + ...create-code-review-w-parameter-removal.yml | 6 + ...recate_ci_project_config_path_variable.yml | 6 + ...cation_bump_terraform_template_version.yml | 18 + .../14_0/deprecation_manage_access_14_0.yml | 17 + ...emplates_to_stop_using_hardcode_master.yml | 6 + .../14_0/deuley_servicetemplates_removal.yml | 8 + ...ounce_deprecation_of_release_notes_api.yml | 7 + .../release_deprecation_auto-deploy-image.yml | 9 + ...iguration_for_gitlab_pages_deprecation.yml | 7 + ...lease_legacy_feature_flags_deprecation.yml | 7 + ...keyvalue_pair_from_the_payload_of_dora.yml | 7 + .../14_0/removal-geo-fdw-settings.yml | 11 + data/removals/14_0/removal-graphql-fields.yml | 13 + data/removals/14_0/removal-legacy-storage.yml | 6 + .../14_0/removal-protect-features.yml | 13 + ...al-sidekiq_experimental_queue_selector.yml | 10 + data/removals/14_0/removal-unicorn.yml | 6 + .../14_0/removal_ci_project_config_path.yml | 11 + .../14_0/removal_enablement_helm2.yml | 8 + .../14_0/removal_enablement_opensuse_15_1.yml | 6 + .../removals/14_0/removal_enablement_pg11.yml | 10 + .../14_0/removal_enablement_ubuntu_16.yml | 11 + ...removal_repost_static_analysis_notices.yml | 39 ++ data/removals/14_0/removal_runner_25555.yml | 7 + data/removals/14_0/removal_runner_26036.yml | 6 + data/removals/14_0/removal_runner_26419.yml | 6 + data/removals/14_0/removal_runner_4845.yml | 6 + data/removals/14_0/removal_runner_6413.yml | 6 + .../14_0/removals-14-testing-team.yml | 26 ++ data/removals/14_0/removals_runner_26651.yml | 6 + data/removals/14_0/removals_runner_26679.yml | 6 + data/removals/14_0/removals_runner_26900.yml | 6 + data/removals/14_0/removals_runner_27175.yml | 6 + data/removals/14_0/removals_runner_27218.yml | 6 + data/removals/14_0/removals_runner_27551.yml | 6 + data/removals/14_0/removals_runner_27899.yml | 6 + data/removals/14_0/remove-sql-elector.yml | 9 + .../14_0/remove_dast_env_variables.yml | 15 + .../remove_dast_legacy_domain_validation.yml | 8 + .../14_0/remove_dast_legacy_report_fields.yml | 8 + .../14_0/remove_dast_spider_host_reset.yml | 6 + .../14_0/remove_dast_template_stages.yml | 6 + data/removals/14_0/remove_optimize_api.yml | 6 + .../14_0/remove_terraform_template.yml | 9 + .../14_0/verify-ci-removal-parametertrace.yml | 8 + .../14_0/verify-ci-removalpipelineservice.yml | 6 + ...moval-memory-prometheus-options-source.yml | 8 + .../14_1/removal-outdated-browser-support.yml | 20 + .../14_2/removal-verify-build-log.yml | 7 + .../14_3/removal-limit-tags-to-50.yml | 6 + .../removal-verify-pe-pipelinefindername.yml | 6 + .../14_3/removal_legacy_storage_setting.yml | 8 + .../templates/_removal_template.md.erb | 50 +++ data/removals/templates/example.yml | 32 ++ data/whats_new/202010230001_13_05.yml | 2 +- data/whats_new/2021102000001_14_04.yml | 2 +- data/whats_new/2021111800001_14_05.yml | 2 +- .../monitoring/prometheus/index.md | 4 +- doc/api/projects.md | 9 +- doc/operations/metrics/dashboards/default.md | 8 +- doc/operations/metrics/dashboards/develop.md | 8 +- doc/operations/metrics/dashboards/index.md | 9 +- .../metrics/dashboards/panel_types.md | 8 +- doc/operations/metrics/dashboards/settings.md | 8 +- .../dashboards/templating_variables.md | 9 +- .../metrics/dashboards/variables.md | 8 +- doc/operations/metrics/dashboards/yaml.md | 8 +- doc/update/deprecations.md | 400 ++++++++---------- doc/update/removals.md | 398 +++++++++++++++++ doc/user/analytics/ci_cd_analytics.md | 11 +- .../cluster_image_scanning/index.md | 1 + .../container_scanning/index.md | 1 + doc/user/application_security/dast/index.md | 1 + doc/user/application_security/sast/index.md | 2 + .../prometheus_library/cloudwatch.md | 8 +- .../prometheus_library/haproxy.md | 8 +- .../integrations/prometheus_library/index.md | 8 +- .../prometheus_library/kubernetes.md | 8 +- .../integrations/prometheus_library/nginx.md | 8 +- .../prometheus_library/nginx_ingress.md | 8 +- .../prometheus_library/nginx_ingress_vts.md | 8 +- lib/api/entities/project.rb | 2 + lib/api/helpers/projects_helpers.rb | 2 + lib/api/projects.rb | 1 + .../DAST-On-Demand-API-Scan.gitlab-ci.yml | 27 ++ lib/gitlab/git/rugged_impl/commit.rb | 3 + .../known_events/ci_templates.yml | 8 + lib/tasks/gitlab/db.rake | 4 +- .../gitlab/docs/compile_deprecations.rake | 39 +- locale/gitlab.pot | 5 +- .../components/wrappers/frontmatter_spec.js | 5 + .../extensions/code_block_highlight_spec.js | 6 + .../conan_installation_spec.js.snap | 2 +- .../maven_installation_spec.js.snap | 10 +- .../nuget_installation_spec.js.snap | 2 +- .../pypi_installation_spec.js.snap | 4 +- .../components/details/app_spec.js | 8 +- .../details/composer_installation_spec.js | 4 +- .../details/conan_installation_spec.js | 5 +- .../details/maven_installation_spec.js | 15 +- .../details/npm_installation_spec.js | 5 +- .../details/nuget_installation_spec.js | 6 +- .../components/details/package_files_spec.js | 2 +- .../details/pypi_installation_spec.js | 8 +- .../package_registry/mock_data.js | 11 + .../vue_mr_widget/mr_widget_options_spec.js | 69 +++ .../frontend/vue_mr_widget/test_extensions.js | 10 + spec/lib/gitlab/git/commit_spec.rb | 10 + spec/requests/api/projects_spec.rb | 49 ++- ...er_registry_authentication_service_spec.rb | 24 ++ .../services/projects/destroy_service_spec.rb | 5 + ...r_registry_auth_service_shared_examples.rb | 2 + .../tooling/docs/deprecation_handling_spec.rb | 40 ++ tooling/deprecations/docs.rb | 39 -- tooling/docs/deprecation_handling.rb | 42 ++ 158 files changed, 1924 insertions(+), 447 deletions(-) create mode 100644 app/views/projects/diffs/_email_line.html.haml create mode 100644 config/feature_flags/development/container_registry_cdn_redirect.yml create mode 100644 config/feature_flags/development/dast_api_scanner.yml rename config/feature_flags/development/{show_relevant_approval_rule_approvers.yml => inline_haml_diff_line_rendering.yml} (61%) create mode 100644 config/feature_flags/development/use_typhoeus_elasticsearch_adapter.yml create mode 100644 data/removals/14_0/14_0-ds-deprecations.yml create mode 100644 data/removals/14_0/14_0-lc-deprecations.yml create mode 100644 data/removals/14_0/change_default_branch_name_to_main.yml create mode 100644 data/removals/14_0/create-code-review-draft-wip.yml create mode 100644 data/removals/14_0/create-code-review-w-parameter-removal.yml create mode 100644 data/removals/14_0/deprecate_ci_project_config_path_variable.yml create mode 100644 data/removals/14_0/deprecation_bump_terraform_template_version.yml create mode 100644 data/removals/14_0/deprecation_manage_access_14_0.yml create mode 100644 data/removals/14_0/deprecation_update_cicd_templates_to_stop_using_hardcode_master.yml create mode 100644 data/removals/14_0/deuley_servicetemplates_removal.yml create mode 100644 data/removals/14_0/release_announce_deprecation_of_release_notes_api.yml create mode 100644 data/removals/14_0/release_deprecation_auto-deploy-image.yml create mode 100644 data/removals/14_0/release_domainsource_configuration_for_gitlab_pages_deprecation.yml create mode 100644 data/removals/14_0/release_legacy_feature_flags_deprecation.yml create mode 100644 data/removals/14_0/release_remove_redundant_keyvalue_pair_from_the_payload_of_dora.yml create mode 100644 data/removals/14_0/removal-geo-fdw-settings.yml create mode 100644 data/removals/14_0/removal-graphql-fields.yml create mode 100644 data/removals/14_0/removal-legacy-storage.yml create mode 100644 data/removals/14_0/removal-protect-features.yml create mode 100644 data/removals/14_0/removal-sidekiq_experimental_queue_selector.yml create mode 100644 data/removals/14_0/removal-unicorn.yml create mode 100644 data/removals/14_0/removal_ci_project_config_path.yml create mode 100644 data/removals/14_0/removal_enablement_helm2.yml create mode 100644 data/removals/14_0/removal_enablement_opensuse_15_1.yml create mode 100644 data/removals/14_0/removal_enablement_pg11.yml create mode 100644 data/removals/14_0/removal_enablement_ubuntu_16.yml create mode 100644 data/removals/14_0/removal_repost_static_analysis_notices.yml create mode 100644 data/removals/14_0/removal_runner_25555.yml create mode 100644 data/removals/14_0/removal_runner_26036.yml create mode 100644 data/removals/14_0/removal_runner_26419.yml create mode 100644 data/removals/14_0/removal_runner_4845.yml create mode 100644 data/removals/14_0/removal_runner_6413.yml create mode 100644 data/removals/14_0/removals-14-testing-team.yml create mode 100644 data/removals/14_0/removals_runner_26651.yml create mode 100644 data/removals/14_0/removals_runner_26679.yml create mode 100644 data/removals/14_0/removals_runner_26900.yml create mode 100644 data/removals/14_0/removals_runner_27175.yml create mode 100644 data/removals/14_0/removals_runner_27218.yml create mode 100644 data/removals/14_0/removals_runner_27551.yml create mode 100644 data/removals/14_0/removals_runner_27899.yml create mode 100644 data/removals/14_0/remove-sql-elector.yml create mode 100644 data/removals/14_0/remove_dast_env_variables.yml create mode 100644 data/removals/14_0/remove_dast_legacy_domain_validation.yml create mode 100644 data/removals/14_0/remove_dast_legacy_report_fields.yml create mode 100644 data/removals/14_0/remove_dast_spider_host_reset.yml create mode 100644 data/removals/14_0/remove_dast_template_stages.yml create mode 100644 data/removals/14_0/remove_optimize_api.yml create mode 100644 data/removals/14_0/remove_terraform_template.yml create mode 100644 data/removals/14_0/verify-ci-removal-parametertrace.yml create mode 100644 data/removals/14_0/verify-ci-removalpipelineservice.yml create mode 100644 data/removals/14_1/removal-memory-prometheus-options-source.yml create mode 100644 data/removals/14_1/removal-outdated-browser-support.yml create mode 100644 data/removals/14_2/removal-verify-build-log.yml create mode 100644 data/removals/14_3/removal-limit-tags-to-50.yml create mode 100644 data/removals/14_3/removal-verify-pe-pipelinefindername.yml create mode 100644 data/removals/14_3/removal_legacy_storage_setting.yml create mode 100644 data/removals/templates/_removal_template.md.erb create mode 100644 data/removals/templates/example.yml create mode 100644 doc/update/removals.md create mode 100644 lib/gitlab/ci/templates/Security/DAST-On-Demand-API-Scan.gitlab-ci.yml create mode 100644 spec/tooling/docs/deprecation_handling_spec.rb delete mode 100644 tooling/deprecations/docs.rb create mode 100644 tooling/docs/deprecation_handling.rb diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index ae36c0cea70..553cb8ed07d 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -77,15 +77,16 @@ ui-docs-links lint: script: - bundle exec haml-lint -i DocumentationLinks -docs-lint deprecations: +docs-lint deprecations-and-removals: variables: SETUP_DB: "false" extends: - .default-retry - .rails-cache - .default-before_script - - .docs:rules:deprecations + - .docs:rules:deprecations-and-removals stage: lint needs: [] script: - bundle exec rake gitlab:docs:check_deprecations + - bundle exec rake gitlab:docs:check_removals diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 570303f044b..af5e0ec93e0 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -171,12 +171,13 @@ - ".markdownlint.yml" - "scripts/lint-doc.sh" -.docs-deprecations-patterns: &docs-deprecations-patterns +.docs-deprecations-and-removals-patterns: &docs-deprecations-and-removals-patterns - "doc/update/deprecations.md" - - "data/deprecations/*.yml" - - "data/deprecations/templates/_deprecation_template.md.erb" + - "doc/update/removals.md" + - "data/deprecations/**/*" + - "data/removals/**/*" + - "tooling/docs/**/*" - "lib/tasks/gitlab/docs/compile_deprecations.rake" - - "tooling/deprecations/docs.rb" .bundler-patterns: &bundler-patterns - '{Gemfile.lock,*/Gemfile.lock,*/*/Gemfile.lock}' @@ -541,10 +542,10 @@ changes: *docs-patterns when: on_success -.docs:rules:deprecations: +.docs:rules:deprecations-and-removals: rules: - <<: *if-default-refs - changes: *docs-deprecations-patterns + changes: *docs-deprecations-and-removals-patterns ################## # GraphQL rules # diff --git a/.rubocop_todo/graphql/field_method.yml b/.rubocop_todo/graphql/field_method.yml index 1cc4aa7e264..7c336451c41 100644 --- a/.rubocop_todo/graphql/field_method.yml +++ b/.rubocop_todo/graphql/field_method.yml @@ -6,7 +6,3 @@ GraphQL/FieldMethod: - app/graphql/types/metrics/dashboards/annotation_type.rb - app/graphql/types/packages/package_details_type.rb - app/graphql/types/project_type.rb - - ee/app/graphql/types/dast/profile_type.rb - - ee/app/graphql/types/dast_site_validation_type.rb - - ee/app/graphql/types/group_release_stats_type.rb - - ee/app/graphql/types/incident_management/oncall_rotation_type.rb diff --git a/Gemfile b/Gemfile index d7ebf9e9412..6be591ce6eb 100644 --- a/Gemfile +++ b/Gemfile @@ -149,6 +149,7 @@ gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-s3', '~> 1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' +gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing gem 'html-pipeline', '~> 2.13.2' diff --git a/Gemfile.lock b/Gemfile.lock index 69b14bb1312..645a38e155b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -333,6 +333,8 @@ GEM escape_utils (1.2.1) et-orbi (1.2.1) tzinfo + ethon (0.15.0) + ffi (>= 1.15.0) eventmachine (1.2.7) excon (0.71.1) execjs (2.8.1) @@ -1311,6 +1313,8 @@ GEM tty-screen (~> 0.8) wisper (~> 2.0) tty-screen (0.8.1) + typhoeus (1.4.0) + ethon (>= 0.9.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) u2f (0.2.1) @@ -1655,6 +1659,7 @@ DEPENDENCIES timecop (~> 0.9.1) toml-rb (~> 2.0) truncato (~> 0.7.11) + typhoeus (~> 1.4.0) u2f (~> 0.2.1) undercover (~> 0.4.4) unf (~> 0.1.4) diff --git a/app/assets/javascripts/behaviors/copy_code.js b/app/assets/javascripts/behaviors/copy_code.js index e4dfdeba209..a8863a18068 100644 --- a/app/assets/javascripts/behaviors/copy_code.js +++ b/app/assets/javascripts/behaviors/copy_code.js @@ -29,7 +29,7 @@ class CopyCodeButton extends HTMLElement { } function addCodeButton() { - [...document.querySelectorAll('pre.code.js-syntax-highlight')] + [...document.querySelectorAll('pre.code.js-syntax-highlight:not(.content-editor-code-block)')] .filter((el) => el.attr('lang') !== 'mermaid') .filter((el) => !el.closest('.js-markdown-code')) .forEach((el) => { diff --git a/app/assets/javascripts/clusters_list/constants.js b/app/assets/javascripts/clusters_list/constants.js index b5729fe4d2d..380a5d0aada 100644 --- a/app/assets/javascripts/clusters_list/constants.js +++ b/app/assets/javascripts/clusters_list/constants.js @@ -106,7 +106,7 @@ export const I18N_AGENT_MODAL = { empty_state: { modalTitle: s__('ClusterAgents|Connect your cluster through the Agent'), modalBody: s__( - "ClusterAgents|To install a new agent, first add the agent's configuration file to this repository. %{linkStart}What's the agent's configuration file?%{linkEnd}", + "ClusterAgents|To install a new agent, first add the agent's configuration file to this repository. %{linkStart}Learn more about installing GitLab Agent.%{linkEnd}", ), enableKasText: s__( "ClusterAgents|Your instance doesn't have the %{linkStart}GitLab Agent Server (KAS)%{linkEnd} set up. Ask a GitLab Administrator to install it.", diff --git a/app/assets/javascripts/content_editor/components/wrappers/frontmatter.vue b/app/assets/javascripts/content_editor/components/wrappers/frontmatter.vue index 97b69afd12e..e8829d00986 100644 --- a/app/assets/javascripts/content_editor/components/wrappers/frontmatter.vue +++ b/app/assets/javascripts/content_editor/components/wrappers/frontmatter.vue @@ -20,7 +20,7 @@ export default { };