Add latest changes from gitlab-org/gitlab@master

6 files changed, 48 insertions, 13 deletions

diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index acdc61d008f..0ae7a10a290 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -147,7 +147,12 @@ released.
 #### TLS enabled
 
 NOTE: **Note**
-This requires GitLab Runner 11.11 or higher.
+Requires GitLab Runner 11.11 or later, but is not supported if GitLab
+Runner is installed using the [Helm
+chart](https://docs.gitlab.com/runner/install/kubernetes.html). See the
+[related
+issue](https://gitlab.com/gitlab-org/charts/gitlab-runner/issues/83) for
+details.
 
 The Docker daemon supports connection over TLS and it's done by default
 for Docker 19.03.8 or higher. This is the **suggested** way to use the
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index e5d619ea00c..e79d44cb057 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1264,7 +1264,9 @@ osx job:
 
 `allow_failure` allows a job to fail without impacting the rest of the CI
 suite.
-The default value is `false`, except for [manual](#whenmanual) jobs.
+The default value is `false`, except for [manual](#whenmanual) jobs using the
+`when: manual` syntax, unless using [`rules:`](#rules) syntax, where all jobs
+default to false, *including* `when: manual` jobs.
 
 When enabled and the job fails, the job will show an orange warning in the UI.
 However, the logical flow of the pipeline will consider the job a
@@ -1379,14 +1381,17 @@ manual action by clicking a _play_ button.
 
 When a pipeline is blocked, it will not be merged if Merge When Pipeline Succeeds
 is set. Blocked pipelines also do have a special status, called _manual_.
-Manual actions are non-blocking by default. If you want to make manual action
-blocking, it is necessary to add `allow_failure: false` to the job's definition
-in `.gitlab-ci.yml`.
+When the `when:manual` syntax is used, manual actions are non-blocking by
+default. If you want to make manual action blocking, it is necessary to add
+`allow_failure: false` to the job's definition in `.gitlab-ci.yml`.
 
 Optional manual actions have `allow_failure: true` set by default and their
 Statuses do not contribute to the overall pipeline status. So, if a manual
 action fails, the pipeline will eventually succeed.
 
+NOTE: **Note:**
+When using [`rules:`](#rules), `allow_failure` defaults to `false`, including for manual jobs.
+
 Manual actions are considered to be write actions, so permissions for
 [protected branches](../../user/project/protected_branches.md) are used when
 a user wants to trigger an action. In other words, in order to trigger a manual
diff --git a/doc/raketasks/README.md b/doc/raketasks/README.md
index 8faace58599..1670849016c 100644
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
@@ -36,3 +36,4 @@ The following are available Rake tasks:
 | [Uploads sanitize](../administration/raketasks/uploads/sanitize.md)                        | Remove EXIF data from images uploaded to earlier versions of GitLab.                      |
 | [User management](user_management.md)                                                      | Perform user management tasks.                                                            |
 | [Webhooks administration](web_hooks.md)                                                    | Maintain project Webhooks.                                                                |
+| [X509 signatures](x509_signatures.md)                                                      | Update x509 commit signatures, useful if certificate store has changed.                   |
diff --git a/doc/raketasks/x509_signatures.md b/doc/raketasks/x509_signatures.md
new file mode 100644
index 00000000000..dd518997f7b
--- /dev/null
+++ b/doc/raketasks/x509_signatures.md
@@ -0,0 +1,22 @@
+# X509 signatures
+
+When [signing commits with x509](../user/project/repository/x509_signed_commits/index.md)
+the trust anchor might change and the signatures stored within the database have
+to be updated.
+
+## Update all x509 signatures
+
+This task loops through all X509 signed commits and updates their verification
+based on current certificate store.
+
+**Omnibus Installation**
+
+```shell
+sudo gitlab-rake gitlab:x509:update_signatures
+```
+
+**Source Installation**
+
+```shell
+sudo -u git -H bundle exec rake gitlab:x509:update_signatures RAILS_ENV=production
+```
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 12d5aa1e29f..63a10fdf4be 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -8,8 +8,8 @@ GitLab offers tiers of features. Your subscription determines which tier you hav
 
 GitLab provides special subscriptions to participants in the [GitLab Education Program](https://about.gitlab.com/solutions/education/) and [GitLab Open Source Program](https://about.gitlab.com/solutions/open-source/). For details on obtaining and renewing these subscriptions, see:
 
-- [GitLab Education Program subscriptions](#gitlab-education-program-subscriptions)
-- [GitLab Open Source Program subscriptions](#gitlab-open-source-program-subscriptions)
+- [GitLab for Education subscriptions](#gitlab-for-education-subscriptions)
+- [GitLab for Open Source subscriptions](#gitlab-for-open-source-subscriptions)
 
 ## Choosing a GitLab subscription
 
@@ -493,9 +493,9 @@ Learn more about:
 - The tiers of [GitLab Support](https://about.gitlab.com/support/).
 - [Submit a request via the Support Portal](https://support.gitlab.com/hc/en-us/requests/new).
 
-## GitLab Education Program subscriptions
+## GitLab for Education subscriptions
 
-To renew a [GitLab Education Program](https://about.gitlab.com/solutions/education/) subscription, send an email to `education@gitlab.com` with the following information:
+To renew a [GitLab for Education](https://about.gitlab.com/solutions/education/) subscription, send an email to `education@gitlab.com` with the following information:
 
 1. The number of seats for the renewal. You can add seats if needed.
 1. The use case for the license. Specifically, we need verification that the use meets the conditions of the [End User License Agreement](https://about.gitlab.com/terms/#edu-oss). Note that university infrastructure operations and information technology operations don't fall within the stated terms of the Education Program. For details, see the [Education FAQ](https://about.gitlab.com/solutions/education/#FAQ).
@@ -503,9 +503,9 @@ To renew a [GitLab Education Program](https://about.gitlab.com/solutions/educati
 
 After we receive the above information, we will process the request and return a renewal quote for signature. Please allow a minimum of 2 business days for return. Email us at `education@gitlab.com` with any questions.
 
-## GitLab Open Source Program subscriptions
+## GitLab for Open Source subscriptions
 
-All requests for our GitLab Open Source program, including subscription renewals, must be made by using the [Open Source Program](https://about.gitlab.com/solutions/open-source/program/) application process. If you have any questions, send an email to `opensource@gitlab.com` for assistance.
+All [GitLab for Open Source](https://about.gitlab.com/solutions/open-source/program/) requests, including subscription renewals, must be made by using the application process. If you have any questions, send an email to `opensource@gitlab.com` for assistance.
 
 <!-- ## Troubleshooting
 
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index ce1e1a31bbe..a7e712a4c0a 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -53,8 +53,10 @@ also requires the GitLab Runner 11.5 or later. For earlier versions, use the
 
 This example shows how to run Code Quality on your code by using GitLab CI/CD and Docker.
 
-First, you need GitLab Runner with
-[docker-in-docker executor](../../../ci/docker/using_docker_build.md#use-docker-in-docker-workflow-with-docker-executor).
+First, you need GitLab Runner with:
+
+- The [docker-in-docker executor](../../../ci/docker/using_docker_build.md#use-docker-in-docker-workflow-with-docker-executor).
+- Enough disk space to handle generated Code Quality files. For example on the [GitLab project](https://gitlab.com/gitlab-org/gitlab) the files are approximately 7 GB.
 
 Once you set up the Runner, include the CodeQuality template in your CI config: