Commit c28407d3 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 8cbc344c 90341cbf
...@@ -2221,10 +2221,10 @@ spinach: ...@@ -2221,10 +2221,10 @@ spinach:
script: rake spinach script: rake spinach
``` ```
It's also possible to use multiple parents for `extends`. In GitLab 12.0 and later, it's also possible to use multiple parents for
The algorithm used for merge is "closest scope wins", so keys `extends`. The algorithm used for merge is "closest scope wins", so
from the last member will always shadow anything defined on other levels. keys from the last member will always shadow anything defined on other
For example: levels. For example:
```yaml ```yaml
.only-important: .only-important:
......
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