Automatic merge of gitlab-org/gitlab-ce master

doc/ci/examples/test-and-deploy-python-application-to-heroku.md

@@ -9,7 +9,12 @@ You can checkout the [example source](https://gitlab.com/ayufan/python-getting-s
 This is what the `.gitlab-ci.yml` file looks like for this project:
 
 ```yaml
+stages:
+  - test
+  - deploy
+
 test:
+  stage: test
   script:
   # this configures Django application to use attached postgres database that is run on `postgres` host
   - export DATABASE_URL=postgres://postgres:@postgres:5432/python-test-app
@@ -19,7 +24,7 @@ test:
   - python manage.py test
 
 staging:
-  type: deploy
+  stage: deploy
   script:
   - apt-get update -qy
   - apt-get install -y ruby-dev
@@ -29,7 +34,7 @@ staging:
   - master
 
 production:
-  type: deploy
+  stage: deploy
   script:
   - apt-get update -qy
   - apt-get install -y ruby-dev

doc/ci/yaml/README.md

@@ -1764,9 +1764,6 @@ TIP: **Tip:**
 Use merging to customize and override included CI/CD configurations with local
 definitions.
 
-Recursive includes are not supported. Your external files should not use the
-`include` keyword as it will be ignored.
-
 NOTE: **Note:**
 Using YAML aliases across different YAML files sourced by `include` is not
 supported. You must only refer to aliases in the same file. Instead