Skip to content
Snippets Groups Projects
Verified Commit 138391fe authored by Lysanne Pinto's avatar Lysanne Pinto :robot: Committed by GitLab
Browse files

Merge branch 'network-charles-9' into 'master'

Replace all occurrences of “below” 2

See merge request gitlab-org/gitlab!193009



Merged-by: default avatarLysanne Pinto <lpinto@gitlab.com>
Approved-by: default avatarLysanne Pinto <lpinto@gitlab.com>
Reviewed-by: default avatarLysanne Pinto <lpinto@gitlab.com>
Co-authored-by: default avatarCharles Uneze <charlesniklaus@gmail.com>
parents a25d935c 64b17543
No related branches found
No related tags found
No related merge requests found
......@@ -74,7 +74,7 @@ To use GitLab CI/CD with a Bitbucket Cloud repository:
is created in Bitbucket, but the mirroring process copies it to the GitLab mirror. The GitLab
CI/CD pipeline runs the script, and pushes the status back to Bitbucket.
Create a file `build_status` and insert the script below and run
Create a file `build_status`, insert the following script and run
`chmod +x build_status` in your terminal to make the script executable.
```shell
......
......@@ -30,7 +30,7 @@ Prerequisites:
- Access to an existing Azure Subscription with `Owner` access level.
- Access to the corresponding Azure Active Directory Tenant with at least the `Application Developer` access level.
- A local installation of the [Azure CLI](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli).
Alternatively, you can follow all the steps below with the [Azure Cloud Shell](https://portal.azure.com/#cloudshell/).
Alternatively, you can use all the following steps with the [Azure Cloud Shell](https://portal.azure.com/#cloudshell/).
- Your GitLab instance must be publicly accessible over the internet as Azure must to connect to the GitLab OIDC endpoint.
- A GitLab project.
......
......@@ -265,7 +265,7 @@ You can access a private registry using two approaches. Both require setting the
private registry, add `DOCKER_AUTH_CONFIG` as an environment variable in the
runner's configuration.
See below for examples of each.
See the following sections for examples of each.
#### Determine your `DOCKER_AUTH_CONFIG` data
......@@ -554,7 +554,7 @@ and manual credential management.
COPY --from=aws-tools /root/.docker/config.json /root/.docker/config.json
```
1. To build the custom GitLab Runner Docker image in a `.gitlab-ci.yml`, include the following example below:
1. To build the custom GitLab Runner Docker image in a `.gitlab-ci.yml`, include the following example:
```yaml
variables:
......
......@@ -59,7 +59,7 @@ and supports multiple secrets engines.
{{< /alert >}}
You must replace the `vault.example.com` URL below with the URL of your Vault server, and `gitlab.example.com` with the URL of your GitLab instance.
You must replace the `vault.example.com` URL in the following examples with the URL of your Vault server, and `gitlab.example.com` with the URL of your GitLab instance.
## Vault Secrets Engines
......
......@@ -48,7 +48,7 @@ To follow along, you must have:
- A Vault server that you are already using.
- CI/CD jobs retrieving secrets from Vault with `CI_JOB_JWT`.
In the examples below, replace:
In the following examples, replace:
- `vault.example.com` with the URL of your Vault server.
- `gitlab.example.com` with the URL of your GitLab instance.
......
......@@ -41,7 +41,7 @@ To follow along, you must have:
{{< alert type="note" >}}
You must replace the `vault.example.com` URL below with the URL of your Vault server,
You must replace the `vault.example.com` URL in the following example with the URL of your Vault server,
and `gitlab.example.com` with the URL of your GitLab instance.
{{< /alert >}}
......@@ -269,7 +269,7 @@ The claim fields listed in [the previous table](#hashicorp-vault-secrets-integra
[Vault's policy path templating](https://developer.hashicorp.com/vault/tutorials/policies/policy-templating?in=vault%2Fpolicies)
purposes by using the accessor name of the JWT auth in Vault.
The [mount accessor name](https://developer.hashicorp.com/vault/tutorials/auth-methods/identity#step-1-create-an-entity-with-alias)
(`ACCESSOR_NAME` in the example below) can be retrieved by running `vault auth list`.
(`ACCESSOR_NAME` in the following example) can be retrieved by running `vault auth list`.
Policy template example making use of a named metadata field named `project_path`:
......
......@@ -162,7 +162,7 @@ run the following query on the instance's PostgreSQL terminal:
SELECT encrypted_ci_jwt_signing_key FROM application_settings;
```
If the returned value is empty, use the Rails snippet below to generate a new key
If the returned value is empty, use the following Rails snippet to generate a new key
and replace it internally:
```ruby
......
......@@ -7,7 +7,7 @@ title: Hardening - CI/CD Recommendations
General hardening guidelines and philosophies are outlined in the [main hardening documentation](hardening.md).
The hardening recommendations and concepts for CI/CD are discussed below.
The hardening recommendations and concepts for CI/CD are discussed in the following section.
## Basic Recommendations
......
......@@ -119,7 +119,7 @@ To use the script:
{{< tab title="Rails console session" >}}
1. In your terminal window, start a Rails console session with `sudo gitlab-rails console`.
1. Paste in the entire `extend_expiring_tokens.rb` script below.
1. Paste in the entire `extend_expiring_tokens.rb` script from the following section.
If desired, change the `expiring_date` to a different date.
1. Press <kbd>Enter</kbd>.
......@@ -128,7 +128,7 @@ To use the script:
{{< tab title="Rails Runner" >}}
1. In your terminal window, connect to your instance.
1. Copy this entire `extend_expiring_tokens.rb` script below, and save it as a file on your instance:
1. Copy the entire `extend_expiring_tokens.rb` script from the following section, and save it as a file on your instance:
- Name it `extend_expiring_tokens.rb`.
- If desired, change the `expiring_date` to a different date.
- The file must be accessible to `git:git`.
......@@ -230,8 +230,8 @@ To use it:
1. In your terminal window, connect to your instance.
1. Start a Rails console session with `sudo gitlab-rails console`.
1. Depending on your needs, copy either the entire `expired_tokens.rb`
or `expired_tokens_date_range.rb` script below, and paste it into the console.
1. Depending on your needs, copy either the entire `expired_tokens.rb` from the following section
or `expired_tokens_date_range.rb` script from the section after that, and paste it into the console.
Change the `expires_at_date` to the date one year after your instance was upgraded to GitLab 16.0.
1. Press <kbd>Enter</kbd>.
......@@ -240,8 +240,8 @@ To use it:
{{< tab title="Rails Runner" >}}
1. In your terminal window, connect to your instance.
1. Depending on your needs, copy either the entire `expired_tokens.rb`
or `expired_tokens_date_range.rb` script below, and save it
1. Depending on your needs, copy either the entire `expired_tokens.rb` from the following section
or `expired_tokens_date_range.rb` script from the section after that, and save it
as a file on your instance:
- Name it `expired_tokens.rb`.
- Change the `expires_at_date` to the date one year after your instance was upgraded to GitLab 16.0.
......@@ -290,7 +290,7 @@ end
{{< alert type="note" >}}
To not only hide, but also remove, tokens belonging to blocked users, add `token.destroy!` directly below
To hide and also remove tokens belonging to blocked users, add `token.destroy!` directly below
`if token.user.blocked?`. However, this action does not leave an audit event,
unlike the [API method](../../api/personal_access_tokens.md#revoke-a-personal-access-token).
......@@ -306,7 +306,7 @@ the exact date your instance was upgraded to GitLab 16.0. To use it:
{{< tab title="Rails console session" >}}
1. In your terminal window, start a Rails console session with `sudo gitlab-rails console`.
1. Paste in the entire `tokens_with_no_expiry.rb` script below.
1. Paste in the entire `expired_tokens_date_range.rb` script from the next section.
If desired, change the `date_range` to a different range.
1. Press <kbd>Enter</kbd>.
......@@ -315,7 +315,7 @@ the exact date your instance was upgraded to GitLab 16.0. To use it:
{{< tab title="Rails Runner" >}}
1. In your terminal window, connect to your instance.
1. Copy this entire `tokens_with_no_expiry.rb` script below, and save it as a file on your instance:
1. Copy the entire `expired_tokens_date_range.rb` script from the next section, and save it as a file on your instance:
- Name it `expired_tokens_date_range.rb`.
- If desired, change the `date_range` to a different range.
- The file must be accessible to `git:git`.
......@@ -429,7 +429,7 @@ or the [Rails Runner](../../administration/operations/rails_console.md#using-the
1. In your terminal window, connect to your instance.
1. Start a Rails console session with `sudo gitlab-rails console`.
1. Paste in the entire `tokens_with_no_expiry.rb` script below.
1. Paste in the entire `tokens_with_no_expiry.rb` script from the following section.
1. Press <kbd>Enter</kbd>.
{{< /tab >}}
......@@ -437,7 +437,7 @@ or the [Rails Runner](../../administration/operations/rails_console.md#using-the
{{< tab title="Rails Runner" >}}
1. In your terminal window, connect to your instance.
1. Copy this entire `tokens_with_no_expiry.rb` script below, and save it as a file on your instance:
1. Copy this entire `tokens_with_no_expiry.rb` script from the following section, and save it as a file on your instance:
- Name it `tokens_with_no_expiry.rb`.
- The file must be accessible to `git:git`.
1. Run this command, changing the path to the _full_ path to your `tokens_with_no_expiry.rb` file:
......
......@@ -193,7 +193,7 @@ GitLab comes in two flavors: [Community Edition](https://about.gitlab.com/featur
and [Enterprise Edition](https://about.gitlab.com/features/#enterprise) which builds on top of the Community Edition and
includes extra features mainly aimed at organizations with more than 100 users.
Below you can find some guides to help you change GitLab editions.
In the following section you can find some guides to help you change GitLab editions.
### Community to Enterprise Edition
......@@ -204,7 +204,7 @@ The following guides are for subscribers of the Enterprise Edition only.
{{< /alert >}}
If you wish to upgrade your GitLab installation from Community to Enterprise
Edition, follow the guides below based on the installation method:
Edition, follow the guides in the following list based on the installation method:
- [Source CE to EE upgrade guides](upgrading_from_ce_to_ee.md) - The steps are very similar
to a version upgrade: stop the server, get the code, update configuration files for
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment