Commit 8ea25523 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'jyavorska-master-patch-51919' into 'master'

Improve migration docs around rules syntax

See merge request gitlab-org/gitlab!26875
parents 53b45639 46d09561
...@@ -45,6 +45,8 @@ There are some high level differences between the products worth mentioning: ...@@ -45,6 +45,8 @@ There are some high level differences between the products worth mentioning:
- Normally all jobs within a single stage run in parallel, and all stages run in sequence. - Normally all jobs within a single stage run in parallel, and all stages run in sequence.
There are different [pipeline architectures](../pipelines/pipeline_architectures.md) There are different [pipeline architectures](../pipelines/pipeline_architectures.md)
that allow you to change this behavior. that allow you to change this behavior.
- The new [`rules` syntax](../yaml/README.md#rules) is the recommended method of
controlling when different jobs run. It is more powerful than the `only/except` syntax.
- The `.gitlab-ci.yml` file is checked in to the root of your repository, much like a Jenkinsfile, but - The `.gitlab-ci.yml` file is checked in to the root of your repository, much like a Jenkinsfile, but
is in the YAML format (see [complete reference](../yaml/README.md)) instead of a Groovy DSL. It's most is in the YAML format (see [complete reference](../yaml/README.md)) instead of a Groovy DSL. It's most
analogous to the declarative Jenkinsfile format. analogous to the declarative Jenkinsfile format.
......
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