From bc1574b93a8e731cacaacfee1e1b9b1ec8ac5a3e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Nov 2022 00:09:06 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/serializers/project_entity.rb | 8 +- .../000_inflections.rb | 1 + config/open_api.yml | 2 + .../geo/replication/datatypes.md | 3 +- doc/ci/git_submodules.md | 7 + doc/ci/runners/configure_runners.md | 21 +- doc/install/docker.md | 2 +- doc/subscriptions/index.md | 2 + doc/user/admin_area/license_file.md | 2 +- .../dependency_scanning/index.md | 3 +- .../output_example_snapshots/html.yml | 198 +-- .../snapshot_spec.html | 1452 ++++++++--------- glfm_specification/output_spec/spec.html | 30 +- lib/api/api.rb | 2 +- lib/api/import_bitbucket_server.rb | 8 + lib/banzai/filter/math_filter.rb | 9 +- lib/banzai/filter/syntax_highlight_filter.rb | 45 +- lib/banzai/pipeline/ascii_doc_pipeline.rb | 2 +- lib/banzai/pipeline/gfm_pipeline.rb | 4 +- locale/gitlab.pot | 6 + .../markdown_golden_master_examples.yml | 14 +- spec/lib/banzai/filter/math_filter_spec.rb | 10 +- .../filter/syntax_highlight_filter_spec.rb | 22 +- spec/lib/gitlab/asciidoc_spec.rb | 19 +- .../concerns/encrypted_user_password_spec.rb | 28 +- .../lib/glfm/update_specification_spec.rb | 6 +- 26 files changed, 966 insertions(+), 940 deletions(-) diff --git a/app/serializers/project_entity.rb b/app/serializers/project_entity.rb index 60c4ba135d6..77e2115fbe2 100644 --- a/app/serializers/project_entity.rb +++ b/app/serializers/project_entity.rb @@ -3,14 +3,14 @@ class ProjectEntity < Grape::Entity include RequestAwareEntity - expose :id - expose :name + expose :id, documentation: { type: 'integer', example: 1 } + expose :name, documentation: { type: 'string', example: 'GitLab' } - expose :full_path do |project| + expose :full_path, documentation: { type: 'string', example: 'gitlab-org/gitlab' } do |project| project_path(project) end - expose :full_name do |project| + expose :full_name, documentation: { type: 'string', example: 'GitLab Org / GitLab' } do |project| project.full_name end end diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb index dfd33938611..cb4ea8d64e4 100644 --- a/config/initializers_before_autoloader/000_inflections.rb +++ b/config/initializers_before_autoloader/000_inflections.rb @@ -30,6 +30,7 @@ ActiveSupport::Inflector.inflections do |inflect| pipeline_artifact_registry project_auto_devops project_registry + project_wiki_repository_registry project_statistics snippet_repository_registry system_note_metadata diff --git a/config/open_api.yml b/config/open_api.yml index a1e07514071..5376c69cdb1 100644 --- a/config/open_api.yml +++ b/config/open_api.yml @@ -43,6 +43,8 @@ metadata: description: Operations related to metadata of the GitLab instance - name: project_hooks description: Operations related to project hooks + - name: project_import_bitbucket + description: Operations related to import BitBucket projects - name: release_links description: Operations related to release assets (links) - name: releases diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md index 566df2ee509..0198d2a63e8 100644 --- a/doc/administration/geo/replication/datatypes.md +++ b/doc/administration/geo/replication/datatypes.md @@ -201,8 +201,7 @@ successfully, you must replicate their data using some other means. |[CI job artifacts](../../../ci/pipelines/job_artifacts.md) | **Yes** (10.4) | **Yes** (14.10) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Verification is behind the feature flag `geo_job_artifact_replication`, enabled by default in 14.10. | |[CI Pipeline Artifacts](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/models/ci/pipeline_artifact.rb) | [**Yes** (13.11)](https://gitlab.com/gitlab-org/gitlab/-/issues/238464) | [**Yes** (13.11)](https://gitlab.com/gitlab-org/gitlab/-/issues/238464) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Persists additional artifacts after a pipeline completes. | |[CI Secure Files](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/models/ci/secure_file.rb) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [No](object_storage.md#verification-of-files-in-object-storage) | Verification is behind the feature flag `geo_ci_secure_file_replication`, enabled by default in 15.3. | -|[Container Registry](../../packages/container_registry.md) | **Yes** (12.3)* | No | No | No | Replication is behind feature flag `geo_container_repository_replication`, enabled by default. -Requires additional configuration. See [instructions](container_registry.md) to set up the Container Registry replication. | +|[Container Registry](../../packages/container_registry.md) | **Yes** (12.3)* | No | No | No | Replication is behind feature flag `geo_container_repository_replication`, enabled by default. Requires additional configuration. See [instructions](container_registry.md) to set up the Container Registry replication. | |[Infrastructure Registry](../../../user/packages/infrastructure_registry/index.md) | **Yes** (14.0) | **Yes** (14.0) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Behind feature flag `geo_package_file_replication`, enabled by default. | |[Project designs repository](../../../user/project/issues/design_management.md) | **Yes** (12.7) | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/32467) | N/A | N/A | Designs also require replication of LFS objects and Uploads. | |[Package Registry](../../../user/packages/package_registry/index.md) | **Yes** (13.2) | **Yes** (13.10) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Behind feature flag `geo_package_file_replication`, enabled by default. | diff --git a/doc/ci/git_submodules.md b/doc/ci/git_submodules.md index ee9d15894fe..35c6c72944a 100644 --- a/doc/ci/git_submodules.md +++ b/doc/ci/git_submodules.md @@ -60,6 +60,13 @@ To make submodules work correctly in CI/CD jobs: GIT_SUBMODULE_STRATEGY: recursive ``` +1. Use `GIT_SUBMODULE_DEPTH` to configure the cloning depth of submodules independently of the [`GIT_DEPTH`](runners/configure_runners.md#shallow-cloning) variable: + + ```yaml + variables: + GIT_SUBMODULE_DEPTH: 1 + ``` + 1. You can filter or exclude specific submodules to control which submodules will be synced using [`GIT_SUBMODULE_PATHS`](runners/configure_runners.md#git-submodule-paths). diff --git a/doc/ci/runners/configure_runners.md b/doc/ci/runners/configure_runners.md index 682b5035d78..6ace58d5b11 100644 --- a/doc/ci/runners/configure_runners.md +++ b/doc/ci/runners/configure_runners.md @@ -312,6 +312,7 @@ globally or for individual jobs: - [`GIT_SUBMODULE_PATHS`](#git-submodule-paths) - [`GIT_SUBMODULE_UPDATE_FLAGS`](#git-submodule-update-flags) - [`GIT_DEPTH`](#shallow-cloning) (shallow cloning) +- [`GIT_SUBMODULE_DEPTH`](#git-submodule-depth) - [`GIT_CLONE_PATH`](#custom-build-directories) (custom build directories) - [`TRANSFER_METER_FREQUENCY`](#artifact-and-cache-settings) (artifact/cache meter update frequency) - [`ARTIFACT_COMPRESSION_LEVEL`](#artifact-and-cache-settings) (artifact archiver compression level) @@ -597,6 +598,24 @@ variables: You can set it globally or per-job in the [`variables`](../yaml/index.md#variables) section. +### Git submodule depth + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3651) in GitLab Runner 15.5. + +Use the `GIT_SUBMODULE_DEPTH` variable to specify the depth of fetching and cloning submodules +when [`GIT_SUBMODULE_STRATEGY`](#git-submodule-strategy) is set to either `normal` or `recursive`. +You can set it globally or for a specific job in the [`variables`](../yaml/index.md#variables) section. + +When you set the `GIT_SUBMODULE_DEPTH` variable, it overwrites the [`GIT_DEPTH`](#shallow-cloning) setting +for the submodules only. + +To fetch or clone only the last 3 commits: + +```yaml +variables: + GIT_SUBMODULE_DEPTH: 3 +``` + ### Custom build directories > [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2211) in GitLab Runner 11.10. @@ -759,7 +778,7 @@ variables: NOTE: Zip archives are the only supported artifact type. Follow [the issue for details](https://gitlab.com/gitlab-org/gitlab/-/issues/367203). -GitLab Runner can generate and produce attestation metadata for all build artifacts. To enable this feature, you must set the `RUNNER_GENERATE_ARTIFACTS_METADATA` environment variable to `true`. This variable can either be set globally or it can be set for individual jobs. The metadata is in rendered in a plain text `.json` file that's stored with the artifact. The file name is as follows: `{JOB_ID}-artifacts-metadata.json`. +GitLab Runner can generate and produce attestation metadata for all build artifacts. To enable this feature, you must set the `RUNNER_GENERATE_ARTIFACTS_METADATA` environment variable to `true`. This variable can either be set globally or it can be set for individual jobs. The metadata is in rendered in a plain text `.json` file that's stored with the artifact. The file name is as follows: `{ARTIFACT_FILE_NAME}-metadata.json`. The file name, however, defaults to `artifacts-metadata.json` if no name was given to the build artifacts. ### Attestation format diff --git a/doc/install/docker.md b/doc/install/docker.md index 7709d71f90a..11525842c6e 100644 --- a/doc/install/docker.md +++ b/doc/install/docker.md @@ -138,7 +138,7 @@ With [Docker Compose](https://docs.docker.com/compose/) you can easily configure install, and upgrade your Docker-based GitLab installation: 1. [Install Docker Compose](https://docs.docker.com/compose/install/). -1. Create a `docker-compose.yml` file (or [download an example](https://gitlab.com/gitlab-org/omnibus-gitlab/raw/master/docker/docker-compose.yml)): +1. Create a `docker-compose.yml` file: ```yaml version: '3.6' diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md index a571256ddea..a66d7d6d27c 100644 --- a/doc/subscriptions/index.md +++ b/doc/subscriptions/index.md @@ -77,6 +77,8 @@ With the [Customers Portal](https://customers.gitlab.com/) you can: - [Change the namespace the subscription is linked to](#change-the-linked-namespace) - [Change customers portal account password](#change-customers-portal-account-password) +The Customers Portal is available only to customers who purchased their subscription from GitLab. If you made your purchase through a partner or reseller, you must contact them directly for assistance with your subscription. + ### Change account owner information Account owner personal details are used on invoices. The account owner email diff --git a/doc/user/admin_area/license_file.md b/doc/user/admin_area/license_file.md index 7ad9383c593..d821d9bab23 100644 --- a/doc/user/admin_area/license_file.md +++ b/doc/user/admin_area/license_file.md @@ -25,7 +25,7 @@ Otherwise, to add your license: 1. Select **Add license**. NOTE: -For GitLab versions 14.1.x or newer, you can access the **Add License** page directly from the URL, `/admin/license/new`. +In GitLab 14.1.x through 14.10.x, you can access the **Add License** page directly from the URL, `/admin/license/new`. In GitLab 15.0 and later, the path is `/admin/subscription`. ## Add your license file during installation diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md index 228379357a3..271b8e24766 100644 --- a/doc/user/application_security/dependency_scanning/index.md +++ b/doc/user/application_security/dependency_scanning/index.md @@ -221,7 +221,7 @@ table.supported-languages ul { N - JavaScript + JavaScript and TypeScript All versions npm @@ -624,7 +624,6 @@ The following variables allow configuration of global dependency scanning settin | ----------------------------|------------ | | `ADDITIONAL_CA_CERT_BUNDLE` | Bundle of CA certs to trust. The bundle of certificates provided here is also used by other tools during the scanning process, such as `git`, `yarn`, or `npm`. See [Using a custom SSL CA certificate authority](#using-a-custom-ssl-ca-certificate-authority) for more details. | | `DS_EXCLUDED_ANALYZERS` | Specify the analyzers (by name) to exclude from Dependency Scanning. For more information, see [Dependency Scanning Analyzers](analyzers.md). | -| `DS_DEFAULT_ANALYZERS` | This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/287691) in GitLab 14.0 and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/333299) in 15.0. Use `DS_EXCLUDED_ANALYZERS` instead. | | `DS_EXCLUDED_PATHS` | Exclude files and directories from the scan based on the paths. A comma-separated list of patterns. Patterns can be globs (see [`doublestar.Match`](https://pkg.go.dev/github.com/bmatcuk/doublestar/v4@v4.0.2#Match) for supported patterns), or file or folder paths (for example, `doc,spec`). Parent directories also match patterns. Default: `"spec, test, tests, tmp"`. | | `DS_IMAGE_SUFFIX` | Suffix added to the image name. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/354796) in GitLab 14.10.) Automatically set to `"-fips"` when FIPS mode is enabled. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/357922) in GitLab 15.0.) | | `SECURE_ANALYZERS_PREFIX` | Override the name of the Docker registry providing the official default images (proxy). Read more about [customizing analyzers](analyzers.md). | diff --git a/glfm_specification/output_example_snapshots/html.yml b/glfm_specification/output_example_snapshots/html.yml index a16ee2e7200..69cff67d27d 100644 --- a/glfm_specification/output_example_snapshots/html.yml +++ b/glfm_specification/output_example_snapshots/html.yml @@ -2,22 +2,22 @@ 02_01_00__preliminaries__tabs__001: canonical: "
foo\tbaz\t\tbim\n
\n" static: "
\n
foo\tbaz\t\tbim
\n\n
" wysiwyg: "
foo\tbaz\t\tbim
" 02_01_00__preliminaries__tabs__002: canonical: "
foo\tbaz\t\tbim\n
\n" static: "
\n
foo\tbaz\t\tbim
\n\n
" wysiwyg: "
foo\tbaz\t\tbim
" 02_01_00__preliminaries__tabs__003: canonical: "
a\ta\nὐ\ta\n
\n" static: "
\n
a\ta\nὐ\ta
\n\n
" wysiwyg: "
a\ta\nὐ\ta
" @@ -52,7 +52,7 @@

  • foo

    - 
      bar
    + 
      bar
    • @@ -68,7 +68,7 @@ static: |-
    - 
      foo
    + 
      foo
    @@ -86,7 +86,7 @@