diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 09:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 09:09:48 +0300 |
| commit | b3e13e0dfd7e26ed569aa9b46f4ec55b41a62411 (patch) | |
| tree | cb7020c0b6a9917df0be74fe8925d314d048bf50 /doc/ci | |
| parent | d786065288786404ab802b15eadf3aa87183c2ff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/merge_request_pipelines/index.md | 2 | ||||
| -rw-r--r-- | doc/ci/migration/circleci.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 1399bd9ec91..ab7734cb1c2 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -100,7 +100,7 @@ Consider the following pipeline, with jobs `A`, `B`, and `C`. Imagine you want: To achieve this, you can configure your `.gitlab-ci.yml` file as follows: -``` yaml +```yaml .only-default: &only-default only: - main diff --git a/doc/ci/migration/circleci.md b/doc/ci/migration/circleci.md index 91ed56e2c9d..eb5ed451778 100644 --- a/doc/ci/migration/circleci.md +++ b/doc/ci/migration/circleci.md @@ -41,7 +41,7 @@ jobs: Example of the same job definition in GitLab CI/CD: -``` yaml +```yaml job1: script: "execute-script-for-job1" ``` |