Automatic merge of gitlab-org/gitlab master

app/models/project_services/mock_deployment_service.rb

-# frozen_string_literal: true
-
-# Deprecated, to be deleted in 13.8 (https://gitlab.com/gitlab-org/gitlab/-/issues/293914)
-#
-# This was a class used only in development environment but became unusable
-# since DeploymentService was deleted
-class MockDeploymentService < Service
-  default_value_for :category, 'deployment'
-
-  def title
-    'Mock deployment'
-  end
-
-  def description
-    'Mock deployment service'
-  end
-
-  def self.to_param
-    'mock_deployment'
-  end
-
-  # No terminals support
-  def terminals(environment)
-    []
-  end
-
-  def self.supported_events
-    %w()
-  end
-
-  def predefined_variables(project:, environment_name:)
-    []
-  end
-
-  def can_test?
-    false
-  end
-end

doc/.vale/gitlab/Acronyms.yml

@@ -48,6 +48,7 @@ exceptions:
   - FAQ
   - FOSS
   - FQDN
+  - FREE
   - GCP
   - GDK
   - GDPR

doc/administration/auth/google_secure_ldap.md

----
-redirect_to: 'ldap/google_secure_ldap.md'
----
-
-This document was moved to [another location](ldap/google_secure_ldap.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md

----
-redirect_to: '../ldap/index.md'
----
-
-This document was moved to [another location](../ldap/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md

----
-redirect_to: '../ldap/index.md'
----
-
-This document was moved to [another location](../ldap/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/auth/ldap-ee.md

----
-redirect_to: 'ldap/index.md'
----
-
-This document was moved to [another location](ldap/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/auth/ldap-troubleshooting.md

----
-redirect_to: 'ldap/ldap-troubleshooting.md'
----
-
-This document was moved to [another location](ldap/ldap-troubleshooting.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/auth/ldap.md

----
-redirect_to: 'ldap/index.md'
----
-
-This document was moved to [another location](ldap/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/availability/index.md

----
-redirect_to: ../reference_architectures/index.md
----
-
-This document was moved to [another location](../reference_architectures/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/build_artifacts.md

----
-redirect_to: 'job_artifacts.md'
----
-
-This document was moved to [job_artifacts](job_artifacts.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/container_registry.md

----
-redirect_to: 'packages/container_registry.md'
----
-
-This document was moved to [another location](packages/container_registry.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/custom_hooks.md

----
-redirect_to: 'server_hooks.md'
----
-
-This document was moved to [another location](server_hooks.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/dependency_proxy.md

----
-redirect_to: 'packages/dependency_proxy.md'
----
-
-This document was moved to [another location](packages/dependency_proxy.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/geo/disaster_recovery/promotion_runbook.md

----
-redirect_to: runbooks/planned_failover_single_node.md
----
-
-This document was moved to [another location](runbooks/planned_failover_single_node.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/geo/replication/database.md

----
-redirect_to: '../setup/database.md'
----
-
-This document was moved to [another location](../setup/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/geo/replication/external_database.md

----
-redirect_to: '../setup/external_database.md'
----
-
-This document was moved to [another location](../setup/external_database.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/geo/replication/high_availability.md

----
-redirect_to: 'multiple_servers.md'
----
-
-This document was moved to [another location](multiple_servers.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/job_traces.md

----
-redirect_to: 'job_logs.md'
----
-
-This document was moved to [another location](job_logs.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/lfs/lfs_administration.md

----
-redirect_to: 'index.md'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/lfs/manage_large_binaries_with_git_lfs.md

----
-redirect_to: '../../topics/git/lfs/index.md'
----
-
-This document was moved to [another location](../../topics/git/lfs/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/lfs/migrate_from_git_annex_to_git_lfs.md

----
-redirect_to: '../../topics/git/lfs/migrate_from_git_annex_to_git_lfs.md'
----
-
-This document was moved to [another location](../../topics/git/lfs/migrate_from_git_annex_to_git_lfs.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/maven_packages.md

----
-redirect_to: 'packages/index.md'
----
-
-This document was moved to [another location](packages/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/maven_repository.md

----
-redirect_to: 'packages/index.md'
----
-
-This document was moved to [another location](packages/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/monitoring/gitlab_instance_administration_project/index.md

----
-redirect_to: '../gitlab_self_monitoring_project/index.md'
----
-
-This document was moved to [another location](../gitlab_self_monitoring_project/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/monitoring/performance/influxdb_configuration.md

----
-redirect_to: 'prometheus.md'
----
-
-Support for InfluxDB was removed in GitLab 13.0. Use [Prometheus](prometheus.md) for performance monitoring.

doc/administration/monitoring/performance/influxdb_schema.md

----
-redirect_to: 'prometheus.md'
----
-
-Support for InfluxDB was removed in GitLab 13.0. Use [Prometheus](prometheus.md) for performance monitoring.

doc/administration/monitoring/performance/introduction.md

----
-redirect_to: 'index.md'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/monitoring/performance/prometheus.md

----
-redirect_to: '../prometheus/index.md'
----
-
-This document was moved to [another location](../prometheus/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md

----
-redirect_to: 'gitlab_exporter.md'
----
-
-This document was moved to [another location](gitlab_exporter.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/npm_registry.md

----
-redirect_to: 'packages/index.md'
----
-
-This document was moved to [another location](packages/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/operations.md

----
-redirect_to: 'operations/index.md'
----
-
-This document was moved to [another location](operations/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/operations/speed_up_ssh.md

----
-redirect_to: 'fast_ssh_key_lookup.md'
----
-
-This document was moved to [another location](fast_ssh_key_lookup.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/packages.md

----
-redirect_to: 'packages/index.md'
----
-
-This document was moved to [another location](packages/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/plugins.md

----
-redirect_to: 'file_hooks.md'
----
-
-This document was moved to [File Hooks](file_hooks.md), after the Plugins feature was renamed to File Hooks.
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/repository_storages.md

----
-redirect_to: 'repository_storage_paths.md'
----
-
-This document was moved to [another location](repository_storage_paths.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/administration/scaling/index.md

----
-redirect_to: ../reference_architectures/index.md
----
-
-This document was moved to [another location](../reference_architectures/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/analytics/contribution_analytics.md

----
-redirect_to: '../user/group/contribution_analytics/index.md'
----
-
-This document was moved to [another location](../user/group/contribution_analytics/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/api/build_triggers.md

----
-redirect_to: 'pipeline_triggers.md'
----
-
-This document was moved to [another location](pipeline_triggers.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/api/builds.md

----
-redirect_to: 'jobs.md'
----
-
-This document was moved to [another location](jobs.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/api/deploy_key_multiple_projects.md

----
-redirect_to: deploy_keys.md#adding-deploy-keys-to-multiple-projects
----
-
-This document was moved to [another location](deploy_keys.md#adding-deploy-keys-to-multiple-projects).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/api/license_templates.md

----
-redirect_to: 'templates/licenses.md'
----
-
-This document was moved to [another location](templates/licenses.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/api/vulnerability_exports.md

@@ -37,7 +37,7 @@ POST /security/projects/:id/vulnerability_exports
 | `id`                | integer or string | yes        | The ID or [URL-encoded path](README.md#namespaced-path-encoding) of the project which the authenticated user is a member of |
 
 ```shell
-curl --header POST "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/vulnerability_exports"
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/security/projects/1/vulnerability_exports"
 ```
 
 The created vulnerability export is automatically deleted after 1 hour.
@@ -83,7 +83,7 @@ POST /security/groups/:id/vulnerability_exports
 | `id`                | integer or string | yes        | The ID or [URL-encoded path](README.md#namespaced-path-encoding) of the group which the authenticated user is a member of |
 
 ```shell
-curl --header POST "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/security/groups/1/vulnerability_exports"
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/security/groups/1/vulnerability_exports"
 ```
 
 The created vulnerability export is automatically deleted after 1 hour.
@@ -116,7 +116,7 @@ POST /security/vulnerability_exports
 ```
 
 ```shell
-curl --header POST "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/security/vulnerability_exports"
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/security/vulnerability_exports"
 ```
 
 The created vulnerability export is automatically deleted after one hour.

doc/monitoring/health_check.md

----
-redirect_to: '../user/admin_area/monitoring/health_check.md'
----
-
-This document was moved to [user/admin_area/monitoring/health_check](../user/admin_area/monitoring/health_check.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/monitoring/performance/gitlab_configuration.md

----
-redirect_to: '../../administration/monitoring/performance/gitlab_configuration.md'
----
-
-This document was moved to [administration/monitoring/performance/gitlab_configuration](../../administration/monitoring/performance/gitlab_configuration.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/monitoring/performance/grafana_configuration.md

----
-redirect_to: '../../administration/monitoring/performance/grafana_configuration.md'
----
-
-This document was moved to [administration/monitoring/performance/grafana_configuration](../../administration/monitoring/performance/grafana_configuration.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/monitoring/performance/influxdb_configuration.md

----
-redirect_to: '../../administration/monitoring/performance/prometheus.md'
----
-
-Support for InfluxDB was removed in GitLab 13.0. Use [Prometheus](../../administration/monitoring/performance/prometheus.md) for performance monitoring.

doc/monitoring/performance/influxdb_schema.md

----
-redirect_to: '../../administration/monitoring/performance/prometheus.md'
----
-
-Support for InfluxDB was removed in GitLab 13.0. Use [Prometheus](../../administration/monitoring/performance/prometheus.md) for performance monitoring.

doc/monitoring/performance/introduction.md

----
-redirect_to: '../../administration/monitoring/performance/index.md'
----
-
-This document was moved to [administration/monitoring/performance/introduction](../../administration/monitoring/performance/index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->