Add latest changes from gitlab-org/gitlab@master

doc/ci/docker/using_docker_images.md

@@ -477,7 +477,7 @@ inside it and you would like to use it as a base image for your job because you
 want to execute some tests with this database binary. Let's also assume that
 this image is configured with `/usr/bin/super-sql run` as an entrypoint. That
 means that when starting the container without additional options, it runs
-the database's process, while runner expects that the image has no
+the database's process, while the runner expects that the image has no
 entrypoint or that the entrypoint is prepared to start a shell command.
 
 With the extended Docker configuration options, instead of creating your

doc/ci/variables/predefined_variables.md

@@ -119,7 +119,7 @@ Kubernetes-specific environment variables are detailed in the
 | `CI_RUNNER_EXECUTABLE_ARCH`                   | all    | 10.6   | The OS/architecture of the GitLab Runner executable (note that this is not necessarily the same as the environment of the executor)                                                                                                                                                                                                                        |
 | `CI_RUNNER_ID`                                | 8.10   | 0.5    | The unique ID of runner being used                                                                                                                                                                                                                                                                                                                         |
 | `CI_RUNNER_REVISION`                          | all    | 10.6   | GitLab Runner revision that is executing the current job                                                                                                                                                                                                                                                                                                   |
-| `CI_RUNNER_SHORT_TOKEN`                       | all    | 12.3   | First eight characters of GitLab Runner's token used to authenticate new job requests. Used as runner's unique ID                                                                                                                                                                                                                                          |
+| `CI_RUNNER_SHORT_TOKEN`                       | all    | 12.3   | First eight characters of the runner's token used to authenticate new job requests. Used as the runner's unique ID                                                                                                                                                                                                                                         |
 | `CI_RUNNER_TAGS`                              | 8.10   | 0.5    | The defined runner tags                                                                                                                                                                                                                                                                                                                                    |
 | `CI_RUNNER_VERSION`                           | all    | 10.6   | GitLab Runner version that is executing the current job                                                                                                                                                                                                                                                                                                    |
 | `CI_SERVER`                                   | all    | all    | Mark that job is executed in CI environment                                                                                                                                                                                                                                                                                                                |

doc/development/documentation/site_architecture/release_process.md

@@ -121,11 +121,10 @@ versions (stable branches `X.Y` of the `gitlab-docs` project):
    pipelines succeed:
 
    NOTE: **Note:**
-   The `release-X-Y` branch needs to be present locally,
-   and you need to have switched to it, otherwise the Rake task will fail.
+   The `release-X-Y` branch needs to be present locally, otherwise the Rake
+   task will abort.
 
    ```shell
-   git checkout release-X-Y
    ./bin/rake release:dropdowns
    ```