Add latest changes from gitlab-org/gitlab@master

5 files changed, 130 insertions, 108 deletions

diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index a85c096db70..d42613edbb2 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -320,8 +320,8 @@ cache:
     - vendor/ruby
 
 before_script:
-  - ruby -v                                   # Print out ruby version for debugging
-  - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
+  - ruby -v                                        # Print out ruby version for debugging
+  - bundle install -j $(nproc) --path vendor/ruby  # Install dependencies into ./vendor/ruby
 
 rspec:
   script:
diff --git a/doc/ci/large_repositories/index.md b/doc/ci/large_repositories/index.md
index ce998502b69..ec8de8d6f6c 100644
--- a/doc/ci/large_repositories/index.md
+++ b/doc/ci/large_repositories/index.md
@@ -31,14 +31,14 @@ it often results in receiving extra commit logs.
 
 Ideally, you should always use `GIT_DEPTH` with a small number
 like 10. This will instruct GitLab Runner to perform shallow clones.
-Shallow clones makes Git request only the latest set of changes for a given branch,
+Shallow clones make Git request only the latest set of changes for a given branch,
 up to desired number of commits as defined by the `GIT_DEPTH` variable.
 
 This significantly speeds up fetching of changes from Git repositories,
 especially if the repository has a very long backlog consisting of number
 of big files as we effectively reduce amount of data transfer.
 
-The following example makes GitLab Runner shallow clone to fetch only a given branch,
+The following example makes GitLab Runner shallow clone to fetch only a given branch;
 it does not fetch any other branches nor tags.
 
 ```yaml
@@ -107,7 +107,7 @@ clean` is disk I/O intensive. Controlling that with `GIT_CLEAN_FLAGS: -ffdx
 -e .build/`, for example, allows you to control and disable removal of some
 directories within the worktree between subsequent runs, which can speed-up
 the incremental builds. This has the biggest effect if you re-use existing
-machines, and have an existing worktree that you can re-use for builds.
+machines and have an existing worktree that you can re-use for builds.
 
 For exact parameters accepted by
 [`GIT_CLEAN_FLAGS`](../yaml/README.md#git-clean-flags), see the documentation
@@ -118,19 +118,19 @@ are dependent on Git version.
 
 > Introduced in GitLab Runner 11.10.
 
-Following the guidelines above, lets imagine that we want to:
+Following the guidelines above, let's imagine that we want to:
 
 - Optimize for a big project (more than 50k files in directory).
 - Use forks-based workflow for contributing.
 - Reuse existing worktrees. Have preconfigured runners that are pre-cloned with repositories.
 - Runner assigned only to project and all forks.
 
-Lets consider the following two examples, one using `shell` executor and
+Let's consider the following two examples, one using `shell` executor and
 other using `docker` executor.
 
 ### `shell` executor example
 
-Lets assume that you have the following [config.toml](https://docs.gitlab.com/runner/configuration/advanced-configuration.html).
+Let's assume that you have the following [config.toml](https://docs.gitlab.com/runner/configuration/advanced-configuration.html).
 
 ```toml
 concurrent = 4
@@ -155,7 +155,7 @@ This `config.toml`:
 
 ### `docker` executor example
 
-Lets assume that you have the following [config.toml](https://docs.gitlab.com/runner/configuration/advanced-configuration.html).
+Let's assume that you have the following [config.toml](https://docs.gitlab.com/runner/configuration/advanced-configuration.html).
 
 ```toml
 concurrent = 4
@@ -238,5 +238,5 @@ concurrent = 4
     volumes = ["/builds:/builds", "/cache:/cache"]
 ```
 
-This makes the cloning configuration to be part of given Runner,
+This makes the cloning configuration to be part of given Runner
 and does not require us to update each `.gitlab-ci.yml`.
diff --git a/doc/ci/parent_child_pipelines.md b/doc/ci/parent_child_pipelines.md
index 269cbd75a9a..03ef042d55a 100644
--- a/doc/ci/parent_child_pipelines.md
+++ b/doc/ci/parent_child_pipelines.md
@@ -31,7 +31,7 @@ set of concurrently running child pipelines, but within the same project:
 - The configuration is split up into smaller child pipeline configurations, which are
   easier to understand. This reduces the cognitive load to understand the overall configuration.
 - Imports are done at the child pipeline level, reducing the likelihood of collisions.
-- Each pipeline has only the steps relevant steps, making it easier to understand what's going on.
+- Each pipeline has only relevant steps, making it easier to understand what's going on.
 
 Child pipelines work well with other GitLab CI features:
 
@@ -40,7 +40,7 @@ Child pipelines work well with other GitLab CI features:
 - Since the parent pipeline in `.gitlab-ci.yml` and the child pipeline run as normal
   pipelines, they can have their own behaviors and sequencing in relation to triggers.
 
-All of this will work with [`include:`](yaml/README.md#include) feature so you can compose
+All of this will work with the [`include:`](yaml/README.md#include) feature so you can compose
 the child pipeline configuration.
 
 ## Examples
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 6dc093b6d0f..19fcca36604 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -633,134 +633,155 @@ if [[ -d "/builds/gitlab-examples/ci-debug-trace/.git" ]]; then
   $'\''git'\'' "clean" "-ffdx"
   $'\''git'\'' "reset" "--hard"
   $'\''git'\'' "remote" "set-url" "origin" "https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git"
-  $'\''git'\'' "fetch" "origin" "--prune" "+refs/heads/*:refs/remotes/origin/*" "+refs/tags/*:refs/tags/*"
-else
-  $'\''mkdir'\'' "-p" "/builds/gitlab-examples/ci-debug-trace.tmp/git-template"
-  $'\''rm'\'' "-r" "-f" "/builds/gitlab-examples/ci-debug-trace"
-  $'\''git'\'' "config" "-f" "/builds/gitlab-examples/ci-debug-trace.tmp/git-template/config" "fetch.recurseSubmodules" "false"
-  echo $'\''\x1b[32;1mCloning repository...\x1b[0;m'\''
-  $'\''git'\'' "clone" "--no-checkout" "https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git" "/builds/gitlab-examples/ci-debug-trace" "--template" "/builds/gitlab-examples/ci-debug-trace.tmp/git-template"
-  $'\''cd'\'' "/builds/gitlab-examples/ci-debug-trace"
-fi
-echo $'\''\x1b[32;1mChecking out dd648b2e as master...\x1b[0;m'\''
-$'\''git'\'' "checkout" "-f" "-q" "dd648b2e48ce6518303b0bb580b2ee32fadaf045"
-'
-+++ hostname
-++ echo 'Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-machine-1480971377-317a7d0f-digital-ocean-4gb...'
-Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-machine-1480971377-317a7d0f-digital-ocean-4gb...
-++ export CI=true
-++ CI=true
-++ export CI_API_V4_URL=https://example.com:3000/api/v4
-++ CI_API_V4_URL=https://example.com:3000/api/v4
-++ export CI_DEBUG_TRACE=false
-++ CI_DEBUG_TRACE=false
-++ export CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ export CI_COMMIT_SHORT_SHA=dd648b2e
-++ CI_COMMIT_SHORT_SHA=dd648b2e
-++ export CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ export CI_COMMIT_REF_NAME=master
-++ CI_COMMIT_REF_NAME=master
-++ export CI_JOB_ID=7046507
-++ CI_JOB_ID=7046507
-++ export CI_REPOSITORY_URL=https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git
-++ CI_REPOSITORY_URL=https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git
-++ export CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
-++ CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
-++ export CI_PROJECT_ID=1796893
-++ CI_PROJECT_ID=1796893
+  $'\''git'\'' "fetch" "origin" "--prune" "+refs/heads/*:refs/remotes/origin/*" "+refs/tags/*:refs/tags/lds"
+++ CI_BUILDS_DIR=/builds
 ++ export CI_PROJECT_DIR=/builds/gitlab-examples/ci-debug-trace
 ++ CI_PROJECT_DIR=/builds/gitlab-examples/ci-debug-trace
+++ export CI_CONCURRENT_ID=87
+++ CI_CONCURRENT_ID=87
+++ export CI_CONCURRENT_PROJECT_ID=0
+++ CI_CONCURRENT_PROJECT_ID=0
 ++ export CI_SERVER=yes
 ++ CI_SERVER=yes
-++ export CI_SERVER_URL=https://example.com:3000
-++ CI_SERVER_URL=https://example.com:3000
-++ export 'CI_SERVER_HOST=example.com'
-++ CI_SERVER_HOST='example.com'
-++ export 'CI_SERVER_NAME=GitLab CI'
-++ CI_SERVER_NAME='GitLab CI'
-++ export CI_SERVER_VERSION=
-++ CI_SERVER_VERSION=
-++ export CI_SERVER_VERSION_MAJOR=
-++ CI_SERVER_VERSION_MAJOR=
-++ export CI_SERVER_VERSION_MINOR=
-++ CI_SERVER_VERSION_MINOR=
-++ export CI_SERVER_VERSION_PATCH=
-++ CI_SERVER_VERSION_PATCH=
-++ export CI_SERVER_REVISION=
-++ CI_SERVER_REVISION=
-++ export GITLAB_CI=true
-++ GITLAB_CI=true
-++ export CI=true
-++ CI=true
-++ export CI_API_V4_URL=https://example.com:3000/api/v4
-++ CI_API_V4_URL=https://example.com:3000/api/v4
-++ export GITLAB_CI=true
-++ GITLAB_CI=true
+++ mkdir -p /builds/gitlab-examples/ci-debug-trace.tmp
+++ echo -n '-----BEGIN CERTIFICATE-----
+-----END CERTIFICATE-----'
+++ export CI_SERVER_TLS_CA_FILE=/builds/gitlab-examples/ci-debug-trace.tmp/CI_SERVER_TLS_CA_FILE
+++ CI_SERVER_TLS_CA_FILE=/builds/gitlab-examples/ci-debug-trace.tmp/CI_SERVER_TLS_CA_FILE
+++ export CI_PIPELINE_ID=52666
+++ CI_PIPELINE_ID=52666
+++ export CI_PIPELINE_URL=https://gitlab.com/gitlab-examples/ci-debug-trace/pipelines/52666
+++ CI_PIPELINE_URL=https://gitlab.com/gitlab-examples/ci-debug-trace/pipelines/52666
 ++ export CI_JOB_ID=7046507
 ++ CI_JOB_ID=7046507
-++ export CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
-++ CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
-++ export CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ export CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
-++ export CI_COMMIT_REF_NAME=master
-++ CI_COMMIT_REF_NAME=master
-++ export CI_COMMIT_NAME=debug_trace
+++ export CI_JOB_URL=https://gitlab.com/gitlab-examples/ci-debug-trace/-/jobs/379424655
+++ CI_JOB_URL=https://gitlab.com/gitlab-examples/ci-debug-trace/-/jobs/379424655
+++ export CI_JOB_TOKEN=[MASKED]
+++ CI_JOB_TOKEN=[MASKED]
+++ export CI_BUILD_ID=379424655
+++ CI_BUILD_ID=379424655
+++ export CI_BUILD_TOKEN=[MASKED]
+++ CI_BUILD_TOKEN=[MASKED]
+++ export CI_REGISTRY_USER=gitlab-ci-token
+++ CI_REGISTRY_USER=gitlab-ci-token
+++ export CI_REGISTRY_PASSWORD=[MASKED]
+++ CI_REGISTRY_PASSWORD=[MASKED]
+++ export CI_REPOSITORY_URL=https://gitlab-ci-token:[MASKED]@gitlab.com/gitlab-examples/ci-debug-trace.git
+++ CI_REPOSITORY_URL=https://gitlab-ci-token:[MASKED]@gitlab.com/gitlab-examples/ci-debug-trace.git
+++ export CI_JOB_NAME=debug_trace
 ++ CI_JOB_NAME=debug_trace
 ++ export CI_JOB_STAGE=test
 ++ CI_JOB_STAGE=test
-++ export CI_SERVER_URL=https://example.com:3000
-++ CI_SERVER_URL=https://example.com:3000
-++ export CI_SERVER_HOST=example.com
-++ CI_SERVER_HOST=example.com
+++ export CI_NODE_TOTAL=1
+++ CI_NODE_TOTAL=1
+++ export CI_BUILD_NAME=debug_trace
+++ CI_BUILD_NAME=debug_trace
+++ export CI_BUILD_STAGE=test
+++ CI_BUILD_STAGE=test
+++ export CI=true
+++ CI=true
+++ export GITLAB_CI=true
+++ GITLAB_CI=true
+++ export CI_SERVER_URL=https://gitlab.com:3000
+++ CI_SERVER_URL=https://gitlab.com:3000
+++ export CI_SERVER_HOST=gitlab.com
+++ CI_SERVER_HOST=gitlab.com
 ++ export CI_SERVER_NAME=GitLab
 ++ CI_SERVER_NAME=GitLab
-++ export CI_SERVER_VERSION=8.14.3-ee
-++ CI_SERVER_VERSION=8.14.3-ee
-++ export CI_SERVER_REVISION=82823
-++ CI_SERVER_REVISION=82823
-++ export CI_PAGES_DOMAIN=gitlab.io
-++ CI_PAGES_DOMAIN=gitlab.io
-++ export CI_PAGES_URL=https://gitlab-examples.gitlab.io/ci-debug-trace
-++ CI_PAGES_URL=https://gitlab-examples.gitlab.io/ci-debug-trace
+++ export CI_SERVER_VERSION=12.6.0-pre
+++ CI_SERVER_VERSION=12.6.0-pre
+++ export CI_SERVER_VERSION_MAJOR=12
+++ CI_SERVER_VERSION_MAJOR=12
+++ export CI_SERVER_VERSION_MINOR=6
+++ CI_SERVER_VERSION_MINOR=6
+++ export CI_SERVER_VERSION_PATCH=0
+++ CI_SERVER_VERSION_PATCH=0
+++ export CI_SERVER_REVISION=f4cc00ae823
+++ CI_SERVER_REVISION=f4cc00ae823
+++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_board_focus_mode,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,marking_project_for_deletion,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
+++ GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_board_focus_mode,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,marking_project_for_deletion,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
 ++ export CI_PROJECT_ID=17893
 ++ CI_PROJECT_ID=17893
 ++ export CI_PROJECT_NAME=ci-debug-trace
 ++ CI_PROJECT_NAME=ci-debug-trace
-++ export 'CI_PROJECT_TITLE="GitLab FOSS'
+++ export CI_PROJECT_TITLE='GitLab FOSS'
 ++ CI_PROJECT_TITLE='GitLab FOSS'
 ++ export CI_PROJECT_PATH=gitlab-examples/ci-debug-trace
 ++ CI_PROJECT_PATH=gitlab-examples/ci-debug-trace
+++ export CI_PROJECT_PATH_SLUG=gitlab-examples-ci-debug-trace
+++ CI_PROJECT_PATH_SLUG=gitlab-examples-ci-debug-trace
 ++ export CI_PROJECT_NAMESPACE=gitlab-examples
 ++ CI_PROJECT_NAMESPACE=gitlab-examples
-++ export CI_PROJECT_URL=https://example.com/gitlab-examples/ci-debug-trace
-++ CI_PROJECT_URL=https://example.com/gitlab-examples/ci-debug-trace
-++ export CI_PIPELINE_ID=52666
-++ CI_PIPELINE_ID=52666
+++ export CI_PROJECT_URL=https://gitlab.com/gitlab-examples/ci-debug-trace
+++ CI_PROJECT_URL=https://gitlab.com/gitlab-examples/ci-debug-trace
+++ export CI_PROJECT_VISIBILITY=public
+++ CI_PROJECT_VISIBILITY=public
+++ export CI_PROJECT_REPOSITORY_LANGUAGES=
+++ CI_PROJECT_REPOSITORY_LANGUAGES=
+++ export CI_DEFAULT_BRANCH=master
+++ CI_DEFAULT_BRANCH=master
+++ export CI_REGISTRY=registry.gitlab.com
+++ CI_REGISTRY=registry.gitlab.com
+++ export CI_API_V4_URL=https://gitlab.com/api/v4
+++ CI_API_V4_URL=https://gitlab.com/api/v4
 ++ export CI_PIPELINE_IID=123
 ++ CI_PIPELINE_IID=123
+++ export CI_PIPELINE_SOURCE=web
+++ CI_PIPELINE_SOURCE=web
+++ export CI_CONFIG_PATH=.gitlab-ci.yml
+++ CI_CONFIG_PATH=.gitlab-ci.yml
+++ export CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
+++ CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
+++ export CI_COMMIT_SHORT_SHA=dd648b2e
+++ CI_COMMIT_SHORT_SHA=dd648b2e
+++ export CI_COMMIT_BEFORE_SHA=0000000000000000000000000000000000000000
+++ CI_COMMIT_BEFORE_SHA=0000000000000000000000000000000000000000
+++ export CI_COMMIT_REF_NAME=master
+++ CI_COMMIT_REF_NAME=master
+++ export CI_COMMIT_REF_SLUG=master
+++ CI_COMMIT_REF_SLUG=master
+++ export CI_COMMIT_MESSAGE=s/CI/Runner
+++ CI_COMMIT_MESSAGE=s/CI/Runner
+++ export CI_COMMIT_TITLE=s/CI/Runner
+++ CI_COMMIT_TITLE=s/CI/Runner
+++ export CI_COMMIT_DESCRIPTION=
+++ CI_COMMIT_DESCRIPTION=
+++ export CI_COMMIT_REF_PROTECTED=true
+++ CI_COMMIT_REF_PROTECTED=true
+++ export CI_BUILD_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045
+++ CI_BUILD_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045
+++ export CI_BUILD_BEFORE_SHA=0000000000000000000000000000000000000000
+++ CI_BUILD_BEFORE_SHA=0000000000000000000000000000000000000000
+++ export CI_BUILD_REF_NAME=master
+++ CI_BUILD_REF_NAME=master
+++ export CI_BUILD_REF_SLUG=master
+++ CI_BUILD_REF_SLUG=master
 ++ export CI_RUNNER_ID=1337
 ++ CI_RUNNER_ID=1337
-++ export CI_RUNNER_DESCRIPTION=shared-runners-manager-1.example.com
-++ CI_RUNNER_DESCRIPTION=shared-runners-manager-1.example.com
-++ export 'CI_RUNNER_TAGS=shared, docker, linux, ruby, mysql, postgres, mongo'
-++ CI_RUNNER_TAGS='shared, docker, linux, ruby, mysql, postgres, mongo'
-++ export CI_REGISTRY=registry.example.com
-++ CI_REGISTRY=registry.example.com
+++ export CI_RUNNER_DESCRIPTION=shared-runners-manager-4.gitlab.com
+++ CI_RUNNER_DESCRIPTION=shared-runners-manager-4.gitlab.com
+++ export 'CI_RUNNER_TAGS=gce, east-c, shared, docker, linux, ruby, mysql, postgres, mongo, git-annex'
+++ CI_RUNNER_TAGS='gce, east-c, shared, docker, linux, ruby, mysql, postgres, mongo, git-annex'
 ++ export CI_DEBUG_TRACE=true
 ++ CI_DEBUG_TRACE=true
 ++ export GITLAB_USER_ID=42
 ++ GITLAB_USER_ID=42
 ++ export GITLAB_USER_EMAIL=user@example.com
 ++ GITLAB_USER_EMAIL=user@example.com
+++ export GITLAB_USER_LOGIN=root
+++ GITLAB_USER_LOGIN=root
+++ export 'GITLAB_USER_NAME=User'
+++ GITLAB_USER_NAME='User'
+++ export CI_DISPOSABLE_ENVIRONMENT=true
+++ CI_DISPOSABLE_ENVIRONMENT=true
+++ export CI_RUNNER_VERSION=12.5.0
+++ CI_RUNNER_VERSION=12.5.0
+++ export CI_RUNNER_REVISION=577f813d
+++ CI_RUNNER_REVISION=577f813d
+++ export CI_RUNNER_EXECUTABLE_ARCH=linux/amd64
+++ CI_RUNNER_EXECUTABLE_ARCH=linux/amd64
 ++ export VERY_SECURE_VARIABLE=imaverysecurevariable
 ++ VERY_SECURE_VARIABLE=imaverysecurevariable
-++ mkdir -p /builds/gitlab-examples/ci-debug-trace.tmp
-++ echo -n '-----BEGIN CERTIFICATE-----
-MIIFQzCCBCugAwIBAgIRAL/ElDjuf15xwja1ZnCocWAwDQYJKoZIhvcNAQELBQAw'
 
 ...
 ```
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 006e998b1ab..1a689674db9 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -740,6 +740,7 @@ running:
 
 ```shell
 sudo gitlab-ctl stop unicorn
+sudo gitlab-ctl stop puma
 sudo gitlab-ctl stop sidekiq
 # Verify
 sudo gitlab-ctl status