Commit 832eb5f8 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'selhorn-fix-code-blocks' into 'master'

Add language tags

See merge request gitlab-org/gitlab!23931
parents 08b26bd5 007874c3
...@@ -102,7 +102,7 @@ Learn how to set up GitLab CI/CD for specific use cases. ...@@ -102,7 +102,7 @@ Learn how to set up GitLab CI/CD for specific use cases.
Supposed your repository contained the following files: Supposed your repository contained the following files:
``` ```plaintext
├── index.html ├── index.html
├── css ├── css
│ └── main.css │ └── main.css
...@@ -144,7 +144,7 @@ orphan branch (let's name it `pages`) that will host your static generator site. ...@@ -144,7 +144,7 @@ orphan branch (let's name it `pages`) that will host your static generator site.
You can create a new empty branch like this: You can create a new empty branch like this:
```bash ```shell
git checkout --orphan pages git checkout --orphan pages
``` ```
...@@ -155,7 +155,7 @@ commits. Push the source files of your static generator in the `pages` branch. ...@@ -155,7 +155,7 @@ commits. Push the source files of your static generator in the `pages` branch.
Below is a copy of `.gitlab-ci.yml` where the most significant line is the last Below is a copy of `.gitlab-ci.yml` where the most significant line is the last
one, specifying to execute everything in the `pages` branch: one, specifying to execute everything in the `pages` branch:
``` ```yaml
image: ruby:2.6 image: ruby:2.6
pages: pages:
...@@ -188,7 +188,7 @@ compressed files, it will serve that version instead of the uncompressed one. ...@@ -188,7 +188,7 @@ compressed files, it will serve that version instead of the uncompressed one.
To take advantage of this feature, the artifact you upload to the Pages should To take advantage of this feature, the artifact you upload to the Pages should
have this structure: have this structure:
``` ```plaintext
public/ public/
├─┬ index.html ├─┬ index.html
│ └ index.html.gz │ └ index.html.gz
...@@ -226,7 +226,7 @@ request for a URL that does not include an extension. ...@@ -226,7 +226,7 @@ request for a URL that does not include an extension.
Consider a Pages site deployed with the following files: Consider a Pages site deployed with the following files:
``` ```plaintext
public/ public/
├─┬ index.html ├─┬ index.html
│ ├ data.html │ ├ data.html
......
...@@ -113,13 +113,13 @@ Artifacts for other pipelines can be accessed with direct access to them. ...@@ -113,13 +113,13 @@ Artifacts for other pipelines can be accessed with direct access to them.
The structure of the URL to download the whole artifacts archive is the following: The structure of the URL to download the whole artifacts archive is the following:
``` ```plaintext
https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/download?job=<job_name> https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/download?job=<job_name>
``` ```
To download a single file from the artifacts use the following URL: To download a single file from the artifacts use the following URL:
``` ```plaintext
https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/raw/<path_to_file>?job=<job_name> https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/raw/<path_to_file>?job=<job_name>
``` ```
...@@ -127,40 +127,40 @@ For example, to download the latest artifacts of the job named `coverage` of ...@@ -127,40 +127,40 @@ For example, to download the latest artifacts of the job named `coverage` of
the `master` branch of the `gitlab` project that belongs to the `gitlab-org` the `master` branch of the `gitlab` project that belongs to the `gitlab-org`
namespace, the URL would be: namespace, the URL would be:
``` ```plaintext
https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/download?job=coverage https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/download?job=coverage
``` ```
To download the file `coverage/index.html` from the same To download the file `coverage/index.html` from the same
artifacts use the following URL: artifacts use the following URL:
``` ```plaintext
https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/raw/coverage/index.html?job=coverage https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/raw/coverage/index.html?job=coverage
``` ```
There is also a URL to browse the latest job artifacts: There is also a URL to browse the latest job artifacts:
``` ```plaintext
https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/browse?job=<job_name> https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/browse?job=<job_name>
``` ```
For example: For example:
``` ```plaintext
https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/browse?job=coverage https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/browse?job=coverage
``` ```
There is also a URL to specific files, including html files that There is also a URL to specific files, including html files that
are shown in [GitLab Pages](../../../administration/pages/index.md): are shown in [GitLab Pages](../../../administration/pages/index.md):
``` ```plaintext
https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/file/<path>?job=<job_name> https://example.com/<namespace>/<project>/-/jobs/artifacts/<ref>/file/<path>?job=<job_name>
``` ```
For example, when a job `coverage` creates the artifact `htmlcov/index.html`, For example, when a job `coverage` creates the artifact `htmlcov/index.html`,
you can access it at: you can access it at:
``` ```plaintext
https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/file/htmlcov/index.html?job=coverage https://gitlab.com/gitlab-org/gitlab/-/jobs/artifacts/master/file/htmlcov/index.html?job=coverage
``` ```
......
...@@ -46,7 +46,7 @@ started: ...@@ -46,7 +46,7 @@ started:
1. Generate the private/public key pair with the following command, which will 1. Generate the private/public key pair with the following command, which will
spawn a series of questions: spawn a series of questions:
```sh ```shell
gpg --full-gen-key gpg --full-gen-key
``` ```
...@@ -57,7 +57,7 @@ started: ...@@ -57,7 +57,7 @@ started:
1. The first question is which algorithm can be used. Select the kind you want 1. The first question is which algorithm can be used. Select the kind you want
or press <kbd>Enter</kbd> to choose the default (RSA and RSA): or press <kbd>Enter</kbd> to choose the default (RSA and RSA):
``` ```plaintext
Please select what kind of key you want: Please select what kind of key you want:
(1) RSA and RSA (default) (1) RSA and RSA (default)
(2) DSA and Elgamal (2) DSA and Elgamal
...@@ -68,7 +68,7 @@ started: ...@@ -68,7 +68,7 @@ started:
1. The next question is key length. We recommend you choose `4096`: 1. The next question is key length. We recommend you choose `4096`:
``` ```plaintext
RSA keys may be between 1024 and 4096 bits long. RSA keys may be between 1024 and 4096 bits long.
What keysize do you want? (2048) 4096 What keysize do you want? (2048) 4096
Requested keysize is 4096 bits Requested keysize is 4096 bits
...@@ -77,7 +77,7 @@ started: ...@@ -77,7 +77,7 @@ started:
1. Specify the validity period of your key. This is something 1. Specify the validity period of your key. This is something
subjective, and you can use the default value, which is to never expire: subjective, and you can use the default value, which is to never expire:
``` ```plaintext
Please specify how long the key should be valid. Please specify how long the key should be valid.
0 = key does not expire 0 = key does not expire
<n> = key expires in n days <n> = key expires in n days
...@@ -90,7 +90,7 @@ started: ...@@ -90,7 +90,7 @@ started:
1. Confirm that the answers you gave were correct by typing `y`: 1. Confirm that the answers you gave were correct by typing `y`:
``` ```plaintext
Is this correct? (y/N) y Is this correct? (y/N) y
``` ```
...@@ -98,7 +98,7 @@ started: ...@@ -98,7 +98,7 @@ started:
(should match a verified email address you use in GitLab) and an optional (should match a verified email address you use in GitLab) and an optional
comment (press <kbd>Enter</kbd> to skip): comment (press <kbd>Enter</kbd> to skip):
``` ```plaintext
GnuPG needs to construct a user ID to identify your key. GnuPG needs to construct a user ID to identify your key.
Real name: Mr. Robot Real name: Mr. Robot
...@@ -113,7 +113,7 @@ started: ...@@ -113,7 +113,7 @@ started:
1. Pick a strong password when asked and type it twice to confirm. 1. Pick a strong password when asked and type it twice to confirm.
1. Use the following command to list the private GPG key you just created: 1. Use the following command to list the private GPG key you just created:
``` ```shell
gpg --list-secret-keys --keyid-format LONG <your_email> gpg --list-secret-keys --keyid-format LONG <your_email>
``` ```
...@@ -122,7 +122,7 @@ started: ...@@ -122,7 +122,7 @@ started:
1. Copy the GPG key ID that starts with `sec`. In the following example, that's 1. Copy the GPG key ID that starts with `sec`. In the following example, that's
`30F2B65B9246B6CA`: `30F2B65B9246B6CA`:
``` ```plaintext
sec rsa4096/30F2B65B9246B6CA 2017-08-18 [SC] sec rsa4096/30F2B65B9246B6CA 2017-08-18 [SC]
D5E4F29F3275DC0CDA8FFC8730F2B65B9246B6CA D5E4F29F3275DC0CDA8FFC8730F2B65B9246B6CA
uid [ultimate] Mr. Robot <your_email> uid [ultimate] Mr. Robot <your_email>
...@@ -131,7 +131,7 @@ started: ...@@ -131,7 +131,7 @@ started:
1. Export the public key of that ID (replace your key ID from the previous step): 1. Export the public key of that ID (replace your key ID from the previous step):
``` ```shell
gpg --armor --export 30F2B65B9246B6CA gpg --armor --export 30F2B65B9246B6CA
``` ```
...@@ -167,7 +167,7 @@ key to use. ...@@ -167,7 +167,7 @@ key to use.
1. Use the following command to list the private GPG key you just created: 1. Use the following command to list the private GPG key you just created:
```sh ```shell
gpg --list-secret-keys --keyid-format LONG <your_email> gpg --list-secret-keys --keyid-format LONG <your_email>
``` ```
...@@ -176,7 +176,7 @@ key to use. ...@@ -176,7 +176,7 @@ key to use.
1. Copy the GPG key ID that starts with `sec`. In the following example, that's 1. Copy the GPG key ID that starts with `sec`. In the following example, that's
`30F2B65B9246B6CA`: `30F2B65B9246B6CA`:
``` ```plaintext
sec rsa4096/30F2B65B9246B6CA 2017-08-18 [SC] sec rsa4096/30F2B65B9246B6CA 2017-08-18 [SC]
D5E4F29F3275DC0CDA8FFC8730F2B65B9246B6CA D5E4F29F3275DC0CDA8FFC8730F2B65B9246B6CA
uid [ultimate] Mr. Robot <your_email> uid [ultimate] Mr. Robot <your_email>
...@@ -185,7 +185,7 @@ key to use. ...@@ -185,7 +185,7 @@ key to use.
1. Tell Git to use that key to sign the commits: 1. Tell Git to use that key to sign the commits:
```sh ```shell
git config --global user.signingkey 30F2B65B9246B6CA git config --global user.signingkey 30F2B65B9246B6CA
``` ```
...@@ -195,7 +195,7 @@ key to use. ...@@ -195,7 +195,7 @@ key to use.
or `gpg: signing failed: secret key not available`, run the following command to or `gpg: signing failed: secret key not available`, run the following command to
change to `gpg2`: change to `gpg2`:
```sh ```shell
git config --global gpg.program gpg2 git config --global gpg.program gpg2
``` ```
...@@ -207,7 +207,7 @@ commits: ...@@ -207,7 +207,7 @@ commits:
1. Commit like you used to, the only difference is the addition of the `-S` flag: 1. Commit like you used to, the only difference is the addition of the `-S` flag:
``` ```shell
git commit -S -m "My commit msg" git commit -S -m "My commit msg"
``` ```
...@@ -217,7 +217,7 @@ commits: ...@@ -217,7 +217,7 @@ commits:
If you don't want to type the `-S` flag every time you commit, you can tell Git If you don't want to type the `-S` flag every time you commit, you can tell Git
to sign your commits automatically: to sign your commits automatically:
``` ```shell
git config --global commit.gpgsign true git config --global commit.gpgsign true
``` ```
......
...@@ -60,26 +60,26 @@ removed from the repository. ...@@ -60,26 +60,26 @@ removed from the repository.
1. Navigate to your repository: 1. Navigate to your repository:
``` ```shell
cd my_repository/ cd my_repository/
``` ```
1. Change to the branch you want to remove the big file from: 1. Change to the branch you want to remove the big file from:
``` ```shell
git checkout master git checkout master
``` ```
1. Create a commit removing the large file from the branch, if it still exists: 1. Create a commit removing the large file from the branch, if it still exists:
``` ```shell
git rm path/to/big_file.mpg git rm path/to/big_file.mpg
git commit -m 'Remove unneeded large file' git commit -m 'Remove unneeded large file'
``` ```
1. Rewrite history: 1. Rewrite history:
``` ```shell
bfg --delete-files path/to/big_file.mpg bfg --delete-files path/to/big_file.mpg
``` ```
...@@ -88,7 +88,7 @@ removed from the repository. ...@@ -88,7 +88,7 @@ removed from the repository.
1. Force-push the changes to GitLab: 1. Force-push the changes to GitLab:
``` ```shell
git push --force-with-lease origin master git push --force-with-lease origin master
``` ```
...@@ -116,31 +116,31 @@ purposes! ...@@ -116,31 +116,31 @@ purposes!
1. Navigate to your repository: 1. Navigate to your repository:
``` ```shell
cd my_repository/ cd my_repository/
``` ```
1. Change to the branch you want to remove the big file from: 1. Change to the branch you want to remove the big file from:
``` ```shell
git checkout master git checkout master
``` ```
1. Use `filter-branch` to remove the big file: 1. Use `filter-branch` to remove the big file:
``` ```shell
git filter-branch --force --tree-filter 'rm -f path/to/big_file.mpg' HEAD git filter-branch --force --tree-filter 'rm -f path/to/big_file.mpg' HEAD
``` ```
1. Instruct Git to purge the unwanted data: 1. Instruct Git to purge the unwanted data:
``` ```shell
git reflog expire --expire=now --all && git gc --prune=now --aggressive git reflog expire --expire=now --all && git gc --prune=now --aggressive
``` ```
1. Lastly, force push to the repository: 1. Lastly, force push to the repository:
``` ```shell
git push --force origin master git push --force origin master
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment